From 14aadfbc7ad9ac23c8bf5d60d407ea556f2b9400 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Tue, 4 Mar 2025 02:28:59 -0800
Subject: [PATCH] GUACAMOLE-1956: Update MINA to latest compatible (v2.2.4).

---
 .../apache-mina-2.2.3/dep-coordinates.txt        |  1 -
 .../NOTICE                                       |  0
 .../README                                       |  2 +-
 .../apache-mina-2.2.4/dep-coordinates.txt        |  1 +
 extensions/guacamole-auth-ldap/pom.xml           | 16 ++++++++++++++++
 5 files changed, 18 insertions(+), 2 deletions(-)
 delete mode 100644 doc/licenses/apache-mina-2.2.3/dep-coordinates.txt
 rename doc/licenses/{apache-mina-2.2.3 => apache-mina-2.2.4}/NOTICE (100%)
 rename doc/licenses/{apache-mina-2.2.3 => apache-mina-2.2.4}/README (90%)
 create mode 100644 doc/licenses/apache-mina-2.2.4/dep-coordinates.txt

diff --git a/doc/licenses/apache-mina-2.2.3/dep-coordinates.txt b/doc/licenses/apache-mina-2.2.3/dep-coordinates.txt
deleted file mode 100644
index c2d0321f7..000000000
--- a/doc/licenses/apache-mina-2.2.3/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.mina:mina-core:jar:2.2.3
diff --git a/doc/licenses/apache-mina-2.2.3/NOTICE b/doc/licenses/apache-mina-2.2.4/NOTICE
similarity index 100%
rename from doc/licenses/apache-mina-2.2.3/NOTICE
rename to doc/licenses/apache-mina-2.2.4/NOTICE
diff --git a/doc/licenses/apache-mina-2.2.3/README b/doc/licenses/apache-mina-2.2.4/README
similarity index 90%
rename from doc/licenses/apache-mina-2.2.3/README
rename to doc/licenses/apache-mina-2.2.4/README
index 12b625967..5c2d8b31a 100644
--- a/doc/licenses/apache-mina-2.2.3/README
+++ b/doc/licenses/apache-mina-2.2.4/README
@@ -1,7 +1,7 @@
 Apache Mina (https://mina.apache.org/)
 --------------------------------------
 
-    Version: 2.2.3
+    Version: 2.2.4
     From: 'Apache Software Foundation' (https://www.apache.org/)
     License(s):
         Apache v2.0
diff --git a/doc/licenses/apache-mina-2.2.4/dep-coordinates.txt b/doc/licenses/apache-mina-2.2.4/dep-coordinates.txt
new file mode 100644
index 000000000..f61bc9a2c
--- /dev/null
+++ b/doc/licenses/apache-mina-2.2.4/dep-coordinates.txt
@@ -0,0 +1 @@
+org.apache.mina:mina-core:jar:2.2.4
diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml
index 698c03496..b7ef05e79 100644
--- a/extensions/guacamole-auth-ldap/pom.xml
+++ b/extensions/guacamole-auth-ldap/pom.xml
@@ -54,6 +54,15 @@
             <version>2.1.7</version>
             <exclusions>
 
+                <!--
+                    Replace vulnerable version of Apache MINA until upstream
+                    releases a version with fixed dependencies.
+                -->
+                <exclusion>
+                    <groupId>org.apache.mina</groupId>
+                    <artifactId>mina-core</artifactId>
+                </exclusion>
+
                 <!--
                     Replace slightly older commons-lang3 (3.15.0) with latest
                     compatible version (3.16.0) so that we don't need two copies
@@ -90,6 +99,13 @@
             <version>3.17.0</version>
         </dependency>
 
+        <!-- Apache MINA (see exclusions for api-all) -->
+        <dependency>
+            <groupId>org.apache.mina</groupId>
+            <artifactId>mina-core</artifactId>
+            <version>2.2.4</version>
+        </dependency>
+
     </dependencies>
 
 </project>