[Yanel-commits] rev 60315 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2011-08-30 23:55:42 +0200 (Tue, 30 Aug 2011)
New Revision: 60315

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
if proxy is set, then use header X-FORWARDED-FOR

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2011-08-30 15:00:53 UTC (rev 60314)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2011-08-30 21:55:42 UTC (rev 60315)
@@ -2653,7 +2653,16 @@
             }
 
             // INFO: For performance reasons we do not use getRemoteHost(), but rather just log the IP address.
-            accessLogMessage = accessLogMessage + AccessLog.encodeLogField("ip", request.getRemoteAddr());
+            if (realm.isProxySet()) {
+                String remoteIPAddr = request.getHeader("X-FORWARDED-FOR");
+                if (remoteIPAddr != null) {
+                    accessLogMessage = accessLogMessage + AccessLog.encodeLogField("ip", remoteIPAddr);
+                } else {
+                    log.warn("No such request header: X-FORWARDED-FOR");
+                }
+            } else {
+                accessLogMessage = accessLogMessage + AccessLog.encodeLogField("ip", request.getRemoteAddr());
+            }
 
             logAccess.info(accessLogMessage);