From b49047cf789a39efd4a0adb97edf0bada45615c0 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Wed, 11 Oct 2017 22:50:14 -0400 Subject: [PATCH] GUACAMOLE-38: Don't try to encode URI before sending it to be parsed. --- .../apache/guacamole/auth/quickconnect/utility/QCParser.java | 4 ++-- .../src/main/resources/controllers/quickconnectController.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java index afe272adb..4ada3f089 100644 --- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java +++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java @@ -92,9 +92,9 @@ public class QCParser { if (userInfo != null && !userInfo.equals("")) { String[] authenticators = userInfo.split(":"); - if (authenticators[0] != null) + if (authenticators.length > 0 && authenticators[0] != null) username = authenticators[0]; - if (authenticators[1] != null) + if (authenticators.length > 1 && authenticators[1] != null) password = authenticators[1]; } diff --git a/extensions/guacamole-auth-quickconnect/src/main/resources/controllers/quickconnectController.js b/extensions/guacamole-auth-quickconnect/src/main/resources/controllers/quickconnectController.js index dc8c22bf9..03137303a 100644 --- a/extensions/guacamole-auth-quickconnect/src/main/resources/controllers/quickconnectController.js +++ b/extensions/guacamole-auth-quickconnect/src/main/resources/controllers/quickconnectController.js @@ -51,7 +51,7 @@ angular.module('guacQuickConnect').controller('quickconnectController', ['$scope */ $scope.quickConnect = function quickConnect() { - quickConnectService.createConnection(encodeURIComponent($scope.uri)) + quickConnectService.createConnection($scope.uri) .success(function createdConnection(connectionId) { $location.url('/client/' + ClientIdentifier.toString({ dataSource : 'quickconnect',