GUACAMOLE-2273: Implement FreeRDP AuthenticateEx callback and handle deprecation of Authenticate callback.

configure.ac

@@ -1010,6 +1010,22 @@ then
                       [[#include <freerdp/freerdp.h>]])
 fi
 
+# Check for either AuthenticateEx or Authenticate callbacks.
+if test "x${have_freerdp}" = "xyes"
+then
+    AC_CHECK_MEMBERS([freerdp.AuthenticateEx],,
+                     [AC_CHECK_MEMBERS([freerdp.Authenticate],,
+                                       [AC_MSG_WARN([
+  ----------------------------------------------------
+   This version of FreeRDP appears to lack support
+   for both Authenticate and AuthenticateEx functions.
+   RDP connections may fail if credentials are not
+   provided with the connection.
+  ----------------------------------------------------])],
+                                       [[#include <freerdp/freerdp.h>]])],
+                      [[#include <freerdp/freerdp.h>]])
+fi
+
 if test "x${have_freerdp}" = "xyes"
 then
     AC_CHECK_DECLS([winpr_aligned_free],

src/protocols/rdp/argv.c

@@ -56,6 +56,24 @@ int guac_rdp_argv_callback(guac_user* user, const char* mimetype,
         settings->domain = guac_strdup(value);
     }
 
+    /* Update gateway username */
+    else if (strcmp(name, GUAC_RDP_ARGV_GATEWAY_USERNAME) == 0) {
+        guac_mem_free(settings->gateway_username);
+        settings->gateway_username = guac_strdup(value);
+    }
+
+    /* Update gateway password */
+    else if (strcmp(name, GUAC_RDP_ARGV_GATEWAY_PASSWORD) == 0) {
+        guac_mem_free(settings->gateway_password);
+        settings->gateway_password = guac_strdup(value);
+    }
+
+    /* Update gateway domain */
+    else if (strcmp(name, GUAC_RDP_ARGV_GATEWAY_DOMAIN) == 0) {
+        guac_mem_free(settings->gateway_domain);
+        settings->gateway_domain = guac_strdup(value);
+    }
+
     return 0;
 
 }

src/protocols/rdp/argv.h

@@ -47,5 +47,23 @@ guac_argv_callback guac_rdp_argv_callback;
  */
 #define GUAC_RDP_ARGV_DOMAIN "domain"
 
+/**
+ * The name of the parameter that specifies/updates the gateway username that
+ * will be sent to the RDP server during authentication.
+ */
+#define GUAC_RDP_ARGV_GATEWAY_USERNAME "gateway-username"
+
+/**
+ * The name of the parameter that specifies/updates the gateway password that
+ * will be sent to the RDP server during authentication.
+ */
+#define GUAC_RDP_ARGV_GATEWAY_PASSWORD "gateway-password"
+
+/**
+ * The name of the parmaeter that specifies/updates the gateway domain that
+ * will be sent to the RDP server during authentication.
+ */
+#define GUAC_RDP_ARGV_GATEWAY_DOMAIN "gateway-domain"
+
 #endif