Changeset 53670

Timestamp:

07/06/2022 05:31:47 AM (11 months ago)

Author:

peterwilsoncc

Message:

Database: Ensure MySQL port numbers are numeric in wpdb.

Ensure the database port number is recorded as an integer or null (the default port) when parsing the database host.

This is to prevent PHP/MySQLi throwing an exception caused by ports represented as numeric strings.

Props audrasjb, azouamauriac, chaion07, costdev, johnjamesjacoby, jrf, sergeybiryukov.
Fixes #54877.

Location:

trunk

Files:

• src/wp-includes/wp-db.php (modified) (1 diff)
• tests/phpunit/tests/db.php (modified) (8 diffs)

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

@@ -2077 +2077 @@
             }
         }
+
+        // MySQLi port cannot be a string; must be null or an integer.
+        $port = $port ? absint( $port ) : null;
 
         return array( $host, $port, $socket, $is_ipv6 );

trunk/tests/phpunit/tests/db.php

@@ -1971 +1971 @@
      * @dataProvider parse_db_host_data_provider
      * @ticket 41722
+     * @ticket 54877
      */
     public function test_parse_db_host( $host_string, $expect_bail, $host, $port, $socket, $is_ipv6 ) {
@@ -2003 +2004 @@
                 false,
                 '',
-                '3306',
+                3306,
                 null,
                 false,
@@ -2032 +2033 @@
             ),
             array(
+                '127.0.0.1:port_as_string',
+                false,
+                '127.0.0.1',
+                null,
+                null,
+                false,
+            ),
+            array(
                 '127.0.0.1:3306',
                 false,
                 '127.0.0.1',
-                '3306',
+                3306,
                 null,
                 false,
@@ -2043 +2052 @@
                 false,
                 '127.0.0.1',
-                '3306',
+                3306,
                 '/tmp/mysql:with_colon.sock',
                 false,
@@ -2056 +2065 @@
             ),
             array(
+                'example.com:port_as_string',
+                false,
+                'example.com',
+                null,
+                null,
+                false,
+            ),
+            array(
                 'example.com:3306',
                 false,
                 'example.com',
-                '3306',
+                3306,
                 null,
                 false,
@@ -2072 +2089 @@
             ),
             array(
+                'localhost:port_as_string',
+                false,
+                'localhost',
+                null,
+                null,
+                false,
+            ),
+            array(
                 'localhost:/tmp/mysql.sock',
                 false,
@@ -2088 +2113 @@
             ),
             array(
+                'localhost:port_as_string:/tmp/mysql:with_colon.sock',
+                false,
+                'localhost',
+                null,
+                '/tmp/mysql:with_colon.sock',
+                false,
+            ),
+            array(
                 '0000:0000:0000:0000:0000:0000:0000:0001',
                 false,
@@ -2115 +2148 @@
                 false,
                 '::1',
-                '3306',
+                3306,
                 null,
                 true,
             ),
             array(
+                '[::1]:port_as_string',
+                false,
+                '::1',
+                null,
+                null,
+                true,
+            ),
+            array(
                 '[::1]:3306:/tmp/mysql:with_colon.sock',
                 false,
                 '::1',
-                '3306',
+                3306,
                 '/tmp/mysql:with_colon.sock',
                 true,