Changeset 42226

Timestamp:

11/24/2017 05:51:31 AM (7 years ago)

Author:

dd32

Message:

WPDB: Fix the parsing of sockets which contain colons within the socket name (used on some cloud providers).

Props natacado.
Fixes #42634 for trunk.

Location:

trunk

Files:

• src/wp-includes/wp-db.php (modified) (2 diffs)
• tests/phpunit/tests/db.php (modified) (4 diffs)

trunk/src/wp-includes/wp-db.php

@@ -1644 +1644 @@
         $is_ipv6 = false;
 
+        // First peel off the socket parameter from the right, if it exists.
+        $socket_pos = strpos( $host, ':/' );
+        if ( $socket_pos !== false ) {
+            $socket = substr( $host, $socket_pos + 1 );
+            $host = substr( $host, 0, $socket_pos );
+        }
+
         // We need to check for an IPv6 address first.
         // An IPv6 address will always contain at least two colons.
         if ( substr_count( $host, ':' ) > 1 ) {
-            $pattern = '#^(?:\[)?(?<host>[0-9a-fA-F:]+)(?:\]:(?<port>[\d]+))?(?:/(?<socket>.+))?#';
+            $pattern = '#^(?:\[)?(?<host>[0-9a-fA-F:]+)(?:\]:(?<port>[\d]+))?#';
             $is_ipv6 = true;
         } else {
             // We seem to be dealing with an IPv4 address.
-            $pattern = '#^(?<host>[^:/]*)(?::(?<port>[\d]+))?(?::(?<socket>.+))?#';
+            $pattern = '#^(?<host>[^:/]*)(?::(?<port>[\d]+))?#';
         }
 
@@ -1663 +1670 @@
 
         $host = '';
-        foreach ( array( 'host', 'port', 'socket' ) as $component ) {
+        foreach ( array( 'host', 'port' ) as $component ) {
             if ( ! empty( $matches[ $component ] ) ) {
                 $$component = $matches[ $component ];

trunk/tests/phpunit/tests/db.php

@@ -1560 +1560 @@
             ),
             array(
+                ':/tmp/mysql:with_colon.sock',
+                false,
+                '',
+                null,
+                '/tmp/mysql:with_colon.sock',
+                false,
+            ),
+            array(
                 '127.0.0.1',
                 false,
@@ -1576 +1584 @@
             ),
             array(
+                '127.0.0.1:3306:/tmp/mysql:with_colon.sock',
+                false,
+                '127.0.0.1',
+                '3306',
+                '/tmp/mysql:with_colon.sock',
+                false,
+            ),
+            array(
                 'example.com',
                 false,
@@ -1608 +1624 @@
             ),
             array(
+                'localhost:/tmp/mysql:with_colon.sock',
+                false,
+                'localhost',
+                null,
+                '/tmp/mysql:with_colon.sock',
+                false,
+            ),
+            array(
                 '0000:0000:0000:0000:0000:0000:0000:0001',
                 false,
@@ -1640 +1664 @@
             ),
             array(
+                '[::1]:3306:/tmp/mysql:with_colon.sock',
+                false,
+                '::1',
+                '3306',
+                '/tmp/mysql:with_colon.sock',
+                true,
+            ),
+            array(
                 '2001:0db8:0000:0000:0000:ff00:0042:8329',
                 false,