You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2017/02/03 22:11:25 UTC
[15/22] incubator-guacamole-client git commit: GUACAMOLE-195: Fix
comments to correctly specify that this is HTTP header-based authentication.
GUACAMOLE-195: Fix comments to correctly specify that this is HTTP header-based authentication.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/b8fb8f77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/b8fb8f77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/b8fb8f77
Branch: refs/heads/master
Commit: b8fb8f771b69b31e5013ff244f65cdb049b96ec3
Parents: 63cb838
Author: Nick Couchman <ni...@yahoo.com>
Authored: Tue Jan 31 22:37:39 2017 -0500
Committer: Nick Couchman <ni...@yahoo.com>
Committed: Tue Jan 31 22:37:39 2017 -0500
----------------------------------------------------------------------
.../guacamole/auth/http/AuthenticationProviderService.java | 4 ++--
.../org/apache/guacamole/auth/http/ConfigurationService.java | 3 ++-
.../apache/guacamole/auth/http/HTTPAuthenticationProvider.java | 6 +++---
.../org/apache/guacamole/auth/http/user/AuthenticatedUser.java | 2 +-
.../guacamole-auth-http/src/main/resources/guac-manifest.json | 2 +-
5 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/b8fb8f77/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/AuthenticationProviderService.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/AuthenticationProviderService.java b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/AuthenticationProviderService.java
index 46bc929..6aa98dc 100644
--- a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/AuthenticationProviderService.java
+++ b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/AuthenticationProviderService.java
@@ -38,7 +38,7 @@ import java.security.Principal;
public class AuthenticationProviderService {
/**
- * Service for retrieving LDAP server configuration information.
+ * Service for retrieving header configuration information.
*/
@Inject
private ConfigurationService confService;
@@ -67,7 +67,7 @@ public class AuthenticationProviderService {
public AuthenticatedUser authenticateUser(Credentials credentials)
throws GuacamoleException {
- // Pull HTTP ticket from request if present
+ // Pull HTTP header from request if present
HttpServletRequest request = credentials.getRequest();
if (request != null) {
String username = request.getRemoteUser();
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/b8fb8f77/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/ConfigurationService.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/ConfigurationService.java b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/ConfigurationService.java
index c1ee8d8..59416a9 100644
--- a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/ConfigurationService.java
+++ b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/ConfigurationService.java
@@ -24,7 +24,8 @@ import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.environment.Environment;
/**
- * Service for retrieving configuration information regarding the LDAP server.
+ * Service for retrieving configuration information for HTTP header-based
+ * authentication.
*
* @author Nick Couchman
*/
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/b8fb8f77/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/HTTPAuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/HTTPAuthenticationProvider.java b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/HTTPAuthenticationProvider.java
index fe7edeb..505f1c5 100644
--- a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/HTTPAuthenticationProvider.java
+++ b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/HTTPAuthenticationProvider.java
@@ -29,7 +29,7 @@ import org.apache.guacamole.net.auth.UserContext;
/**
* Guacamole authentication backend which authenticates users using an
- * arbitrary external system implementing HTTP. No storage for connections is
+ * arbitrary external HTTP header. No storage for connections is
* provided - only authentication. Storage must be provided by some other
* extension.
*
@@ -45,7 +45,7 @@ public class HTTPAuthenticationProvider implements AuthenticationProvider {
/**
* Creates a new HTTPAuthenticationProvider that authenticates users
- * against an HTTP service
+ * using HTTP headers.
*
* @throws GuacamoleException
* If a required property is missing, or an error occurs while parsing
@@ -69,7 +69,7 @@ public class HTTPAuthenticationProvider implements AuthenticationProvider {
public AuthenticatedUser authenticateUser(Credentials credentials)
throws GuacamoleException {
- // Attempt to authenticate user with given credentials
+ // Pass credentials to authentication service.
AuthenticationProviderService authProviderService = injector.getInstance(AuthenticationProviderService.class);
return authProviderService.authenticateUser(credentials);
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/b8fb8f77/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/user/AuthenticatedUser.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/user/AuthenticatedUser.java b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/user/AuthenticatedUser.java
index 390d184..52a226e 100644
--- a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/user/AuthenticatedUser.java
+++ b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/user/AuthenticatedUser.java
@@ -25,7 +25,7 @@ import org.apache.guacamole.net.auth.AuthenticationProvider;
import org.apache.guacamole.net.auth.Credentials;
/**
- * An HTTP-specific implementation of AuthenticatedUser, associating a
+ * An HTTP header implementation of AuthenticatedUser, associating a
* username and particular set of credentials with the HTTP authentication
* provider.
*
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/b8fb8f77/extensions/guacamole-auth-http/src/main/resources/guac-manifest.json
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-http/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-http/src/main/resources/guac-manifest.json
index 8982341..0432dc3 100644
--- a/extensions/guacamole-auth-http/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-http/src/main/resources/guac-manifest.json
@@ -2,7 +2,7 @@
"guacamoleVersion" : "0.9.11-incubating",
- "name" : "HTTP Authentication Extension",
+ "name" : "HTTP Header Authentication Extension",
"namespace" : "guac-http",
"authProviders" : [