safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 13:41:21 +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

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

@@ -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 = "";