GUACAMOLE-47: Remove XFF header code due to security concerns.

This commit is contained in:
Nick Couchman
2017-01-28 12:58:53 -05:00
parent 00df0d75eb
commit 3fadac632c

View File

@@ -68,17 +68,14 @@ public class APIRequest extends HttpServletRequestWrapper {
super(request); super(request);
// Try a few methods to get client info. // Grab the remote host info.
if (request.getHeader("X-Forwarded-For") != null && !request.getHeader("X-Forwarded-For").isEmpty()) if (request.getRemoteHost() != null && !request.getRemoteHost().isEmpty())
this.remoteHost = null;
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-Forwarded-For") != null && !request.getHeader("X-Forwarded-For").isEmpty()) // Grab the remote ip info.
this.remoteAddr = request.getHeader("X-Forwarded-For"); if(request.getRemoteHost() != null && !request.getRemoteAddr().isEmpty())
else if(request.getRemoteHost() != null && !request.getRemoteAddr().isEmpty())
this.remoteAddr = request.getRemoteAddr(); this.remoteAddr = request.getRemoteAddr();
else else
this.remoteAddr = null; this.remoteAddr = null;