adam/guacamole-client
1
0 Fork 0
Code Issues Pull Requests 1 Packages Releases Wiki Activity

GUACAMOLE-47: Tweak internal variable names for tokens.

Browse Source
This commit is contained in:
Nick Couchman committed 2017-01-28 13:39:49 -05:00
1 parent 962bec8806
commit b785fc208b
2 files changed
+10 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java
+6 -8
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 = "";