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/01/28 18:52:15 UTC
[04/13] incubator-guacamole-client git commit: GUACAMOLE-47: Tweak
internal variable names for tokens.
GUACAMOLE-47: Tweak internal variable names for tokens.
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/b785fc20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/b785fc20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/b785fc20
Branch: refs/heads/master
Commit: b785fc208b080bb39c593775dd9b0487ed597b31
Parents: 962bec8
Author: Nick Couchman <ni...@yahoo.com>
Authored: Fri Jan 6 20:10:38 2017 -0500
Committer: Nick Couchman <ni...@yahoo.com>
Committed: Sat Jan 28 13:39:49 2017 -0500
----------------------------------------------------------------------
.../org/apache/guacamole/token/StandardTokens.java | 8 ++++----
.../java/org/apache/guacamole/rest/APIRequest.java | 14 ++++++--------
2 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/b785fc20/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 0902310..037e22c 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
@@ -45,12 +45,12 @@ public class StandardTokens {
/**
* The name of the client token added via addStandardTokens().
*/
- public static final String CLIENT_HOST_TOKEN = "GUAC_REMHOST";
+ public static final String REMHOST_TOKEN = "GUAC_REMHOST";
/**
* The IP of the client token added via addStandardTokens().
*/
- public static final String CLIENT_IP_TOKEN = "GUAC_REMIP";
+ public static final String REMIP_TOKEN = "GUAC_REMIP";
/**
* 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(CLIENT_HOST_TOKEN, request.getRemoteHost());
- filter.setToken(CLIENT_IP_TOKEN, request.getRemoteAddr());
+ filter.setToken(REMHOST_TOKEN, request.getRemoteHost());
+ filter.setToken(REMIP_TOKEN, request.getRemoteAddr());
}
// Add any tokens which do not require credentials
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/b785fc20/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java
----------------------------------------------------------------------
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java b/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java
index 6a49c3e..c1c9612 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java
@@ -69,23 +69,21 @@ public class APIRequest extends HttpServletRequestWrapper {
super(request);
// Try a few methods to get client info.
- String clientHostname = "";
- String clientAddress = "";
- if(request.getHeader("X-Guacamole-Client-Hostname") != "") {
+ if(request.getHeader("X-Guacamole-Client-Hostname") != null && request.getHeader("X-Guacamole-Client-Hostname") != "") {
this.remoteHost = request.getHeader("X-Guacamole-Client-Hostname");
- } else if(request.getHeader("X-Forwarded-For") != "") {
+ } else if(request.getHeader("X-Forwarded-For") != null && request.getHeader("X-Forwarded-For") != "") {
this.remoteHost = request.getHeader("X-Forwarded-For");
- } else if(request.getRemoteHost() != "") {
+ } else if(request.getRemoteHost() != null && request.getRemoteHost() != "") {
this.remoteHost = request.getRemoteHost();
} else {
this.remoteHost = "";
}
- if(request.getHeader("X-Guacamole-Client-IP") != "") {
+ if(request.getHeader("X-Guacamole-Client-IP") != null && request.getHeader("X-Guacamole-Client-IP") != "") {
this.remoteAddr = request.getHeader("X-Guacamole-Client-IP");
- } else if(request.getHeader("X-Forwarded-For") != "") {
+ } else if(request.getHeader("X-Forwarded-For") != null && request.getHeader("X-Forwarded-For") != "") {
this.remoteAddr = request.getHeader("X-Forwarded-For");
- } else if(request.getRemoteAddr() != "") {
+ } else if(request.getRemoteHost() != null && request.getRemoteAddr() != "") {
this.remoteAddr = request.getRemoteAddr();
} else {
this.remoteAddr = "";