Improve IP address resolution strategy.

Author: Maikuolan

Changelog.md

@@ -69,3 +69,7 @@ __*Why "v3.0.0" instead of "v1.0.0?"*__ Prior to phpMussel v3, the "phpMussel Co
 [2022.02.01; Bug-fix; Maikuolan]: Failed to correctly determine the client's IP address under certain circumstances (e.g., multiple choices available via HTTP_X_FORWARDED_FOR); Fixed.
 
 [2022.02.14; Maikuolan]: Maintenance release.
+
+### v3.3.2
+
+[2022.02.21; Maikuolan]: Improved IP address resolution strategy.

assets/config.yml

@@ -7,7 +7,7 @@
 # License: GNU/GPLv2
 # @see LICENSE.txt
 #
-# This file: Configuration defaults file (last modified: 2021.11.27).
+# This file: Configuration defaults file (last modified: 2022.02.20).
 ##/
 
 core:
@@ -128,10 +128,12 @@ core:
    CF-Connecting-IP: "CF-Connecting-IP (Cloudflare)"
    HTTP_X_FORWARDED_FOR: "HTTP_X_FORWARDED_FOR (Cloudbric)"
    X-Forwarded-For: "X-Forwarded-For (Squid)"
+   Forwarded: "Forwarded"
    REMOTE_ADDR: "REMOTE_ADDR ({label_default})"
   See also:
-   NGINX Reverse Proxy: "https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/"
-   Squid configuration directive forwarded_for: "http://www.squid-cache.org/Doc/config/forwarded_for/"
+   "NGINX Reverse Proxy": "https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/"
+   "Squid configuration directive forwarded_for": "http://www.squid-cache.org/Doc/config/forwarded_for/"
+   "Forwarded - HTTP | MDN": "https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Forwarded"
  delete_on_sight:
   type: "bool"
   default: false

composer.json

@@ -12,7 +12,7 @@
     },
     "require": {
         "php": ">=7.2.0",
-        "maikuolan/common": "^2.8",
+        "maikuolan/common": "^2.9",
         "ext-pcre": "*"
     },
     "suggest": {

src/Loader.php

@@ -8,7 +8,7 @@
  * License: GNU/GPLv2
  * @see LICENSE.txt
  *
- * This file: The loader (last modified: 2022.02.14).
+ * This file: The loader (last modified: 2022.02.21).
  */
 
 namespace phpMussel\Core;
@@ -320,23 +320,8 @@ public function __construct(
             $this->$Path = $$Path;
         }
 
-        /** Failsafe for weird ipaddr configuration. */
-        $this->IPAddr = (
-            $this->Configuration['core']['ipaddr'] !== 'REMOTE_ADDR' && empty($_SERVER[$this->Configuration['core']['ipaddr']])
-        ) ? 'REMOTE_ADDR' : $this->Configuration['core']['ipaddr'];
-
-        /** Ensure we have an IP address available to work with. */
-        $this->IPAddr = $_SERVER[$this->IPAddr] ?? '';
-
-        /** Ensure the IP address we're working with is a string. */
-        if (is_array($this->IPAddr)) {
-            $this->IPAddr = array_shift($this->IPAddr);
-        }
-        if (is_string($this->IPAddr) && ($Pos = strpos($this->IPAddr, ', ')) !== false) {
-            $this->IPAddr = substr($this->IPAddr, 0, $Pos);
-        }
-        $this->IPAddr = (string)$this->IPAddr;
-        unset($Pos);
+        /** Fetch the IP address of the current request. */
+        $this->IPAddr = (new \Maikuolan\Common\IPHeader($this->Configuration['core']['ipaddr']))->Resolution;
 
         /** Set timezone. */
         if (!empty($this->Configuration['core']['timezone']) && $this->Configuration['core']['timezone'] !== 'SYSTEM') {