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

GUACAMOLE-47: Fix checking for empty strings; Set tokens to null if nothing found.

Browse Source
This commit is contained in:
Nick Couchman
2017-01-25 12:40:12 -05:00
parent b785fc208b
commit 1b9f7c5154
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,24 +69,24 @@ 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.
if(request.getHeader("X-Guacamole-Client-Hostname") != null && request.getHeader("X-Guacamole-Client-Hostname") != "") { if(request.getHeader("X-Guacamole-Client-Hostname") != null && !request.getHeader("X-Guacamole-Client-Hostname").isEmpty()) {
this.remoteHost = request.getHeader("X-Guacamole-Client-Hostname"); this.remoteHost = request.getHeader("X-Guacamole-Client-Hostname");
} else if(request.getHeader("X-Forwarded-For") != null && request.getHeader("X-Forwarded-For") != "") { } else if(request.getHeader("X-Forwarded-For") != null && !request.getHeader("X-Forwarded-For").isEmpty()) {
this.remoteHost = request.getHeader("X-Forwarded-For"); this.remoteHost = request.getHeader("X-Forwarded-For");
} else if(request.getRemoteHost() != null && request.getRemoteHost() != "") { } else if(request.getRemoteHost() != null && !request.getRemoteHost().isEmpty()) {
this.remoteHost = request.getRemoteHost(); this.remoteHost = request.getRemoteHost();
} else { } else {
this.remoteHost = ""; this.remoteHost = null;
} }
if(request.getHeader("X-Guacamole-Client-IP") != null && request.getHeader("X-Guacamole-Client-IP") != "") { if(request.getHeader("X-Guacamole-Client-IP") != null && !request.getHeader("X-Guacamole-Client-IP").isEmpty()) {
this.remoteAddr = request.getHeader("X-Guacamole-Client-IP"); this.remoteAddr = request.getHeader("X-Guacamole-Client-IP");
} else if(request.getHeader("X-Forwarded-For") != null && request.getHeader("X-Forwarded-For") != "") { } else if(request.getHeader("X-Forwarded-For") != null && !request.getHeader("X-Forwarded-For").isEmpty()) {
this.remoteAddr = request.getHeader("X-Forwarded-For"); this.remoteAddr = request.getHeader("X-Forwarded-For");
} else if(request.getRemoteHost() != null && request.getRemoteAddr() != "") { } else if(request.getRemoteHost() != null && !request.getRemoteAddr().isEmpty()) {
this.remoteAddr = request.getRemoteAddr(); this.remoteAddr = request.getRemoteAddr();
} else { } else {
this.remoteAddr = ""; this.remoteAddr = null;
} }
// Copy parameters from given MultivaluedMap // Copy parameters from given MultivaluedMap