fix(Connection): connection gets properly mapped for both IPv4 and IPv6 socket bindings

This fixes an issue which caused the URI mapping of the connections to fail when not using the IPv6 notation for both IPv4 and IPv6 addresses. It now supports both formats (IPv4 and IPv6 notation) and additionally resolves IPv4 addresses that are passed in the IPv6 notation.
Tested with: native IPv4, native IPv4 in IPv6 notation, native IPv6

Author: ncosta-ic

library/Notifications/Daemon/Server.php

@@ -177,9 +177,12 @@ public function reload(): void
     protected function mapRequestToConnection(ServerRequestInterface $request): ?Connection
     {
         $params = $request->getServerParams();
+        $scheme = $request->getUri()->getScheme();
 
         if (isset($params['REMOTE_ADDR']) && isset($params['REMOTE_PORT'])) {
-            $address = Connection::parseHostAndPort($params['REMOTE_ADDR'] . ':' . $params['REMOTE_PORT']);
+            $address = Connection::parseHostAndPort(
+                $scheme . '://' . $params['REMOTE_ADDR'] . ':' . $params['REMOTE_PORT']
+            );
             foreach ($this->connections as $connection) {
                 if ($connection->getAddress() === $address->addr) {
                     return $connection;

library/Notifications/Model/Daemon/Connection.php

@@ -125,28 +125,28 @@ public static function parseHostAndPort(?string $address)
         ];
 
         // host
-        $host = substr(
-            $raw,
-            strpos($raw, '[') + 1,
-            strpos($raw, ']') - (strpos($raw, '[') + 1)
-        );
-        if (! $host) {
+        $host = parse_url($raw, PHP_URL_HOST);
+        $port = parse_url($raw, PHP_URL_PORT);
+
+        if (! $host || ! $port) {
             return false;
         }
 
-        if (strpos($host, '.')) {
-            // it's an IPv4, stripping empty IPv6 tags
-            $parsed->host = substr($host, strrpos($host, ':') + 1);
+        if (strpos($host, '[') !== false) {
+            // IPv6 format
+            if (strpos($host, '.')) {
+                // IPv4 represented in IPv6
+                $offset = strrpos($host, ':');
+                $parsed->host = substr($host, $offset === false ? 0 : $offset + 1, -1);
+            } else {
+                // it's a native IPv6
+                $parsed->host = $host;
+            }
         } else {
+            // IPv4 format
             $parsed->host = $host;
         }
 
-        // port
-        $port = substr($raw, strpos($raw, ']') + 2);
-        if (! $port) {
-            return false;
-        }
-
         $parsed->port = $port;
         $parsed->addr = $parsed->host . ':' . $parsed->port;