From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Fri, 23 Mar 2012 08:00:43 +0000 (-0700)
Subject: Pass ALL parameters through connect, allowing arbitrary additional parameters to... 
X-Git-Url: http://git.alex.org.uk

Pass ALL parameters through connect, allowing arbitrary additional parameters to be used for authentication. Previously, only an "id" parameter was passed to connect, and the contents of that parameter was the entire query string.
---

diff --git a/src/main/webapp/client.xhtml b/src/main/webapp/client.xhtml
index c0b0749..9213907 100644
--- a/src/main/webapp/client.xhtml
+++ b/src/main/webapp/client.xhtml
@@ -128,11 +128,13 @@
 
                     try {
 
-                        // Get ID
-                        var id = window.location.search.substring(1);
+                        // Get entire query string, and pass to connect().
+                        // Normally, only the "id" parameter is required, but
+                        // all parameters should be preserved and passed on for
+                        // the sake of authentication.
 
-                        // Connect client
-                        guac.connect("id=" + id);
+                        var connect_string = window.location.search.substring(1);
+                        guac.connect(connect_string);
 
                     }
                     catch (e) {
diff --git a/src/main/webapp/index.xhtml b/src/main/webapp/index.xhtml
index 463d90b..3db5d5a 100644
--- a/src/main/webapp/index.xhtml
+++ b/src/main/webapp/index.xhtml
@@ -116,7 +116,7 @@
 
                 // If only one connection, redirect to that.
                 if (configs.length == 1) {
-                    window.location.href = "client.xhtml?" + encodeURIComponent(configs[0].id);
+                    window.location.href = "client.xhtml?id=" + encodeURIComponent(configs[0].id);
                     return;
                 }