GUACAMOLE-47: Remove custom header code due to complexity & security concerns.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/00df0d75 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/00df0d75 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/00df0d75 Branch: refs/heads/master Commit: 00df0d75ebc1eed173a6fc49c7142acc260181a5 Parents: f08a66b Author: Nick Couchman <[email protected]> Authored: Sat Jan 28 08:23:32 2017 -0500 Committer: Nick Couchman <[email protected]> Committed: Sat Jan 28 13:40:09 2017 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/guacamole/rest/APIRequest.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/00df0d75/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java ---------------------------------------------------------------------- diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java b/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java index 29c9402..57839a5 100644 --- a/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java @@ -69,18 +69,14 @@ public class APIRequest extends HttpServletRequestWrapper { super(request); // Try a few methods to get client info. - if (request.getHeader("X-Guacamole-Client-Hostname") != null && !request.getHeader("X-Guacamole-Client-Hostname").isEmpty()) - this.remoteHost = request.getHeader("X-Guacamole-Client-Hostname"); - else if (request.getHeader("X-Forwarded-For") != null && !request.getHeader("X-Forwarded-For").isEmpty()) + if (request.getHeader("X-Forwarded-For") != null && !request.getHeader("X-Forwarded-For").isEmpty()) this.remoteHost = null; else if (request.getRemoteHost() != null && !request.getRemoteHost().isEmpty()) this.remoteHost = request.getRemoteHost(); else this.remoteHost = null; - if (request.getHeader("X-Guacamole-Client-IP") != null && !request.getHeader("X-Guacamole-Client-IP").isEmpty()) - this.remoteAddr = request.getHeader("X-Guacamole-Client-IP"); - else if(request.getHeader("X-Forwarded-For") != null && !request.getHeader("X-Forwarded-For").isEmpty()) + if(request.getHeader("X-Forwarded-For") != null && !request.getHeader("X-Forwarded-For").isEmpty()) this.remoteAddr = request.getHeader("X-Forwarded-For"); else if(request.getRemoteHost() != null && !request.getRemoteAddr().isEmpty()) this.remoteAddr = request.getRemoteAddr();
