GUACAMOLE-38: Brush up comments and removed some extra code.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/6c71f4dd Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/6c71f4dd Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/6c71f4dd Branch: refs/heads/master Commit: 6c71f4ddb3b7863864f1081b178acccbb7e9fe0d Parents: 8fa0cea Author: Nick Couchman <[email protected]> Authored: Sat Mar 24 20:37:19 2018 -0400 Committer: Nick Couchman <[email protected]> Committed: Fri Jun 1 13:40:50 2018 -0400 ---------------------------------------------------------------------- extensions/guacamole-auth-quickconnect/pom.xml | 7 ++++--- .../quickconnect/QuickConnectAuthenticationProvider.java | 4 ---- .../guacamole/auth/quickconnect/utility/QCParser.java | 11 ++++++++--- 3 files changed, 12 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/6c71f4dd/extensions/guacamole-auth-quickconnect/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-quickconnect/pom.xml b/extensions/guacamole-auth-quickconnect/pom.xml index 87ee7bd..717f42c 100644 --- a/extensions/guacamole-auth-quickconnect/pom.xml +++ b/extensions/guacamole-auth-quickconnect/pom.xml @@ -187,9 +187,10 @@ <!-- Jersey - JAX-RS Implementation --> <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-server</artifactId> - <version>1.17.1</version> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + <version>1.1.1</version> + <scope>provided</scope> </dependency> <!-- Guice --> http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/6c71f4dd/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectAuthenticationProvider.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectAuthenticationProvider.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectAuthenticationProvider.java index f725bdf..c809709 100644 --- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectAuthenticationProvider.java +++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectAuthenticationProvider.java @@ -63,10 +63,6 @@ public class QuickConnectAuthenticationProvider extends SimpleAuthenticationProv public AuthenticatedUser authenticateUser(Credentials credentials) throws GuacamoleException { - String username = credentials.getUsername(); - if (username == null || username.isEmpty()) - throw new GuacamoleInvalidCredentialsException("You must login.", CredentialsInfo.USERNAME_PASSWORD); - return null; } http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/6c71f4dd/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java ---------------------------------------------------------------------- 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 05b892f..3de9e80 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 @@ -27,10 +27,15 @@ import org.apache.guacamole.GuacamoleClientException; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.protocol.GuacamoleConfiguration; +/** + * A utility class to parse out a URI into the settings necessary + * to create and establish a Guacamole connection. + */ public class QCParser { /** - * The default protocol to parse to if one is undefined. + * The default protocol to parse to if one is provided in + * the incoming URI.. */ public static final String DEFAULT_URI_PROTOCOL = "ssh"; @@ -71,7 +76,7 @@ public class QCParser { } String protocol = qcUri.getScheme(); String host = qcUri.getHost(); - Integer port = qcUri.getPort(); + int port = qcUri.getPort(); String userInfo = qcUri.getUserInfo(); String query = qcUri.getQuery(); String username = null; @@ -101,7 +106,7 @@ public class QCParser { GuacamoleConfiguration qcConfig = new GuacamoleConfiguration(); qcConfig.setProtocol(protocol); qcConfig.setParameter("hostname",host); - qcConfig.setParameter("port", port.toString()); + qcConfig.setParameter("port", Integer.toString(port)); if (username != null) qcConfig.setParameter("username", username);
