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

GUACAMOLE-47: Remove custom header code due to complexity & security concerns.

Browse Source
This commit is contained in:
Nick Couchman
2017-01-28 08:23:32 -05:00
parent f08a66bb7f
commit 00df0d75eb
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,18 +69,14 @@ 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").isEmpty()) if (request.getHeader("X-Forwarded-For") != null && !request.getHeader("X-Forwarded-For").isEmpty())
this.remoteHost = request.getHeader("X-Guacamole-Client-Hostname");
else if (request.getHeader("X-Forwarded-For") != null && !request.getHeader("X-Forwarded-For").isEmpty())
this.remoteHost = null; this.remoteHost = null;
else if (request.getRemoteHost() != null && !request.getRemoteHost().isEmpty()) else if (request.getRemoteHost() != null && !request.getRemoteHost().isEmpty())
this.remoteHost = request.getRemoteHost(); this.remoteHost = request.getRemoteHost();
else else
this.remoteHost = null; this.remoteHost = null;
if (request.getHeader("X-Guacamole-Client-IP") != null && !request.getHeader("X-Guacamole-Client-IP").isEmpty()) if(request.getHeader("X-Forwarded-For") != null && !request.getHeader("X-Forwarded-For").isEmpty())
this.remoteAddr = request.getHeader("X-Guacamole-Client-IP");
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().isEmpty()) else if(request.getRemoteHost() != null && !request.getRemoteAddr().isEmpty())
this.remoteAddr = request.getRemoteAddr(); this.remoteAddr = request.getRemoteAddr();