Changeset 35366

Timestamp:

10/23/2015 04:45:10 AM (9 years ago)

Author:

dd32

Message:

XMLRPC: Prevent authentication from occuring after a failed authentication attmept in any single XML-RPC call.

This hardens WordPress against a common vector which uses multiple user identifiers in a single system.multicall call. In the event that authentication fails, all following authentication attempts in that call will also fail.

Props dd32, johnbillion.
Fixes #34336

Location:

trunk

Files:

• src/wp-includes/class-wp-xmlrpc-server.php (modified) (2 diffs)
• tests/phpunit/includes/testcase-xmlrpc.php (modified) (2 diffs)
• tests/phpunit/tests/xmlrpc/basic.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -45 +45 @@
      */
     public $error;
+
+    /**
+     * Flags that the user authentication has failed in this instance of wp_xmlrpc_server.
+     *
+     * @access protected
+     * @var bool
+     */
+    protected $auth_failed = false;
 
     /**
@@ -252 +260 @@
         }
 
-        $user = wp_authenticate($username, $password);
-
-        if (is_wp_error($user)) {
+        if ( $this->auth_failed ) {
+            $user = new WP_Error( 'login_prevented' );
+        } else {
+            $user = wp_authenticate( $username, $password );
+        }
+
+        if ( is_wp_error( $user ) ) {
             $this->error = new IXR_Error( 403, __( 'Incorrect username or password.' ) );
+
+            // Flag that authentication has failed once on this wp_xmlrpc_server instance
+            $this->auth_failed = true;
 
             /**

trunk/tests/phpunit/includes/testcase-xmlrpc.php

@@ -12 +12 @@
         add_filter( 'pre_option_enable_xmlrpc', '__return_true' );
 
-        $this->myxmlrpcserver = new wp_xmlrpc_server();
+        $this->myxmlrpcserver = new WP_XMLRPC_Server_UnitTestable();
     }
 
     function tearDown() {
         remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
+
+         $this->myxmlrpcserver->reset_failed_auth();
+
         $this->remove_added_uploads();
 
@@ -30 +33 @@
     }
 }
+
+class WP_XMLRPC_Server_UnitTestable extends wp_xmlrpc_server {
+    public function reset_failed_auth() {
+        $this->auth_failed = false;
+    }
+}

trunk/tests/phpunit/tests/xmlrpc/basic.php

@@ -20 +20 @@
         $user_id = $this->make_user_by_role( 'subscriber' );
 
+        $this->assertTrue( $this->myxmlrpcserver->login_pass_ok( 'subscriber', 'subscriber' ) );
+        $this->assertInstanceOf( 'WP_User', $this->myxmlrpcserver->login( 'subscriber', 'subscriber' ) );
+    }
+
+    function test_login_pass_bad() {
+        $user_id = $this->make_user_by_role( 'subscriber' );
+
         $this->assertFalse( $this->myxmlrpcserver->login_pass_ok( 'username', 'password' ) );
         $this->assertFalse( $this->myxmlrpcserver->login( 'username', 'password' ) );
 
-        $this->assertTrue( $this->myxmlrpcserver->login_pass_ok( 'subscriber', 'subscriber' ) );
-        $this->assertInstanceOf( 'WP_User', $this->myxmlrpcserver->login( 'subscriber', 'subscriber' ) );
+        // The auth will still fail due to authentication blocking after the first failed attempt
+        $this->assertFalse( $this->myxmlrpcserver->login_pass_ok( 'subscriber', 'subscriber' ) );
+    }
+
+    /**
+     * @ticket 34336
+     */
+    function test_multicall_invalidates_all_calls_after_invalid_call() {
+        $editor_id = $this->make_user_by_role( 'editor' );
+        $post_id = self::factory()->post->create( array(
+            'post_author' => $editor_id,
+        ) );
+
+        $method_calls = array(
+            // Valid login
+            array(
+                'methodName' => 'wp.editPost',
+                'params'     => array(
+                    0,
+                    'editor',
+                    'editor',
+                    $post_id,
+                    array(
+                        'title' => 'Title 1',
+                    ),
+                ),
+            ),
+            // *Invalid* login
+            array(
+                'methodName' => 'wp.editPost',
+                'params'     => array(
+                    0,
+                    'editor',
+                    'password',
+                    $post_id,
+                    array(
+                        'title' => 'Title 2',
+                    ),
+                ),
+            ),
+            // Valid login
+            array(
+                'methodName' => 'wp.editPost',
+                'params'     => array(
+                    0,
+                    'editor',
+                    'editor',
+                    $post_id,
+                    array(
+                        'title' => 'Title 3',
+                    ),
+                ),
+            ),
+        );
+
+        $this->myxmlrpcserver->callbacks = $this->myxmlrpcserver->methods;
+
+        $result = $this->myxmlrpcserver->multiCall( $method_calls );
+
+        $this->assertArrayNotHasKey( 'faultCode', $result[0] );
+        $this->assertArrayHasKey( 'faultCode', $result[1] );
+        $this->assertArrayHasKey( 'faultCode', $result[2] );
+
     }
 }