Add an optional parameter to use a specific header value (e.g. X-Forw…

…arder-For) instead of local detected IP in the logs. Fix #763
pydio · Dec 30, 2014 · 4242a32 · 4242a32
1 parent 456df5d
commit 4242a32
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/core/src/plugins/core.log/class.AJXP_Logger.php b/core/src/plugins/core.log/class.AJXP_Logger.php
@@ -217,14 +217,19 @@ public static function logAction($action, $params=array())
      */
     public static function getClientAdress()
     {
+        if (isSet(self::$globalOptions["CUSTOM_HEADER_FOR_IP"])){
+            $hName = "HTTP_".strtoupper(str_replace("-", "_", self::$globalOptions["CUSTOM_HEADER_FOR_IP"]));
+            if(isSet($_SERVER[$hName])) {
+                return $_SERVER[$hName];
+            }
+        }
         if (isSet($_SERVER['REMOTE_ADDR'])) {
-            $msg = $_SERVER['REMOTE_ADDR'];
-        } else if (php_sapi_name() == "cli") {
-            $msg = "PHP_CLI";
-        } else {
-            $msg = "Unknown Origin";
+            return $_SERVER['REMOTE_ADDR'];
+        }
+        if (php_sapi_name() == "cli") {
+            return "PHP_CLI";
         }
-        return $msg;
+        return "Unknown Origin";
     }
 
     /**

diff --git a/core/src/plugins/core.log/manifest.xml b/core/src/plugins/core.log/manifest.xml
@@ -5,6 +5,8 @@
     <server_settings>
         <global_param name="ERROR_TO_ERROR_LOG" type="boolean" label="CONF_MESSAGE[Send errors to system log]"
                       description="CONF_MESSAGE[Always send all Error-level messages to the system error log]" default="false" mandatory="true"/>
+        <global_param name="CUSTOM_HEADER_FOR_IP" type="string" label="CONF_MESSAGE[Custom Header for IP]"
+                      description="CONF_MESSAGE[Can be used in a proxy situation to use e.g. X-Forwarded-For header value instead of proxy IP.]" mandatory="false"/>
         <global_param description="CONF_MESSAGE[Plugin instance to handle log implementation]" label="CONF_MESSAGE[Logger plugin]"
                       name="UNIQUE_PLUGIN_INSTANCE" type="plugin_instance:log" default="log.text" mandatory="true"/>
     </server_settings>