Merge pull request #14833 from seamuslee001/ids_ip_logging_improvements

Ensure that if present the HTTP_X_FORWARDED_FOR IP address is used in…
civicrm · Jul 24, 2019 · f4e89ad · f4e89ad
2 parents 9585cab + e7ecda7
commit f4e89ad
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/CRM/Core/IDS.php b/CRM/Core/IDS.php
@@ -247,10 +247,8 @@ public function react(IDS_Report $result) {
    * @return bool
    */
   private function log($result, $reaction = 0) {
-    $ip = (isset($_SERVER['SERVER_ADDR']) &&
-      $_SERVER['SERVER_ADDR'] != '127.0.0.1') ? $_SERVER['SERVER_ADDR'] : (
-      isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : '127.0.0.1'
-      );
+    // Include X_FORWARD_FOR ip address if set as per IDS patten.
+    $ip = $_SERVER['REMOTE_ADDR'] . (isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? ' (' . $_SERVER['HTTP_X_FORWARDED_FOR'] . ')' : '');
 
     $data = [];
     $session = CRM_Core_Session::singleton();