ip logging behind proxies now works

diff --git a/source/mir/session/HTTPAdapters.java b/source/mir/session/HTTPAdapters.java
index 08c8221..78cd362 100755 (executable)
--- a/source/mir/session/HTTPAdapters.java
+++ b/source/mir/session/HTTPAdapters.java
@@ -110,13 +110,22 @@ public class HTTPAdapters {
     }
 
     public String getHeader(String aHeaderName) {
-      if (aHeaderName.equals("ip"))
-        return request.getRequest().getRemoteAddr();
+      if (aHeaderName.equals("ip")) {
+        // transparent proxies propagate the originating ip in the x-forwarded-for
+        // header. So if it's there, we should use it.
+        Enumeration headers = request.getRequest().getHeaders("x-forwarded-for");
+        if (headers.hasMoreElements()) {
+          return (String) headers.nextElement();
+        }
+        else {
+          return request.getRequest().getRemoteAddr();
+        }
+      }
 
       if (aHeaderName.equals("hostname")) {
         if (cachedHostName==null) {
           try {
-            cachedHostName = InetAddress.getByName(request.getRequest().getRemoteAddr()).getHostName();
+            cachedHostName = InetAddress.getByName(getHeader("ip")).getHostName();
           }
           catch (UnknownHostException e) {
             cachedHostName = request.getRequest().getRemoteAddr();