Repository: incubator-guacamole-client Updated Branches: refs/heads/master 8462d6ba0 -> 257c160aa
GUACAMOLE-47: Correct documentation of address/hostname token names. 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/1ed73e6a Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/1ed73e6a Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/1ed73e6a Branch: refs/heads/master Commit: 1ed73e6a9778c321aefc4587c5bd96cb658a0291 Parents: 0d65003 Author: Michael Jumper <[email protected]> Authored: Sat Jan 28 11:20:23 2017 -0800 Committer: Michael Jumper <[email protected]> Committed: Sat Jan 28 11:20:23 2017 -0800 ---------------------------------------------------------------------- .../org/apache/guacamole/token/StandardTokens.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1ed73e6a/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java ---------------------------------------------------------------------- diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java b/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java index 9cb1f41..2d0dd34 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java @@ -21,8 +21,8 @@ package org.apache.guacamole.token; import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.guacamole.net.auth.Credentials; import javax.servlet.http.HttpServletRequest; +import org.apache.guacamole.net.auth.Credentials; /** * Utility class which provides access to standardized token names, as well as @@ -43,14 +43,14 @@ public class StandardTokens { public static final String PASSWORD_TOKEN = "GUAC_PASSWORD"; /** - * The name of the client token added via addStandardTokens(). + * The name of the client hostname token added via addStandardTokens(). */ - public static final String REMHOST_TOKEN = "GUAC_CLIENT_HOSTNAME"; + public static final String CLIENT_HOSTNAME_TOKEN = "GUAC_CLIENT_HOSTNAME"; /** - * The IP of the client token added via addStandardTokens(). + * The name of the client address token added via addStandardTokens(). */ - public static final String REMIP_TOKEN = "GUAC_CLIENT_ADDRESS"; + public static final String CLIENT_ADDRESS_TOKEN = "GUAC_CLIENT_ADDRESS"; /** * The name of the date token (server-local time) added via @@ -129,8 +129,8 @@ public class StandardTokens { // Add client hostname and ip tokens HttpServletRequest request = credentials.getRequest(); if (request != null) { - filter.setToken(REMHOST_TOKEN, request.getRemoteHost()); - filter.setToken(REMIP_TOKEN, request.getRemoteAddr()); + filter.setToken(CLIENT_HOSTNAME_TOKEN, request.getRemoteHost()); + filter.setToken(CLIENT_ADDRESS_TOKEN, request.getRemoteAddr()); } // Add any tokens which do not require credentials
