safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-08 06:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-47: Tweak internal variable names for tokens.

Browse Source
This commit is contained in:
Nick Couchman
2017-01-06 20:10:38 -05:00
parent 962bec8806
commit b785fc208b
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java
View File

@@ -45,12 +45,12 @@ public class StandardTokens {
/** /**
* The name of the client token added via addStandardTokens(). * 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(). * 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 * The name of the date token (server-local time) added via
@@ -129,8 +129,8 @@ public class StandardTokens {
// Add client hostname and ip tokens // Add client hostname and ip tokens
HttpServletRequest request = credentials.getRequest(); HttpServletRequest request = credentials.getRequest();
if (request != null) { if (request != null) {
filter.setToken(CLIENT_HOST_TOKEN, request.getRemoteHost()); filter.setToken(REMHOST_TOKEN, request.getRemoteHost());
filter.setToken(CLIENT_IP_TOKEN, request.getRemoteAddr()); filter.setToken(REMIP_TOKEN, request.getRemoteAddr());
} }
// Add any tokens which do not require credentials // Add any tokens which do not require credentials

14
guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java
View File

@@ -69,23 +69,21 @@ public class APIRequest extends HttpServletRequestWrapper {
super(request); super(request);
// Try a few methods to get client info. // Try a few methods to get client info.
String clientHostname = ""; if(request.getHeader("X-Guacamole-Client-Hostname") != null && request.getHeader("X-Guacamole-Client-Hostname") != "") {
String clientAddress = "";
if(request.getHeader("X-Guacamole-Client-Hostname") != "") {
this.remoteHost = 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"); this.remoteHost = request.getHeader("X-Forwarded-For");
} else if(request.getRemoteHost() != "") { } else if(request.getRemoteHost() != null && request.getRemoteHost() != "") {
this.remoteHost = request.getRemoteHost(); this.remoteHost = request.getRemoteHost();
} else { } else {
this.remoteHost = ""; 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"); 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"); this.remoteAddr = request.getHeader("X-Forwarded-For");
} else if(request.getRemoteAddr() != "") { } else if(request.getRemoteHost() != null && request.getRemoteAddr() != "") {
this.remoteAddr = request.getRemoteAddr(); this.remoteAddr = request.getRemoteAddr();
} else { } else {
this.remoteAddr = ""; this.remoteAddr = "";