Changeset 39588

Timestamp:

12/12/2016 09:41:44 PM (8 years ago)

Author:

flixos90

Message:

Multisite: Handle capability check for removing oneself via map_meta_cap().

Site administrators should not be able to remove themselves from a site. This moves the enforcement of this rule from wp-admin/users.php to remove_user_from_blog() via the remove_user capability, which furthermore allows us to get rid of two additional clauses and their is_super_admin() checks in wp-admin/users.php. A unit test for the new behavior has been added.

Fixes #39063. See #37616.

Location:

trunk

Files:

• src/wp-admin/users.php (modified) (2 diffs)
• src/wp-includes/capabilities.php (modified) (1 diff)
• tests/phpunit/tests/user/capabilities.php (modified) (1 diff)

trunk/src/wp-admin/users.php

@@ -322 +322 @@
     foreach ( $userids as $id ) {
         $id = (int) $id;
-        if ( $id == $current_user->ID && !is_super_admin() ) {
-            $update = 'err_admin_remove';
-            continue;
-        }
         if ( !current_user_can('remove_user', $id) ) {
             $update = 'err_admin_remove';
@@ -378 +374 @@
         $id = (int) $id;
         $user = get_userdata( $id );
-        if ( $id == $current_user->ID && !is_super_admin() ) {
-            /* translators: 1: user id, 2: user login */
-            echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be removed.</strong>'), $id, $user->user_login) . "</li>\n";
-        } elseif ( !current_user_can('remove_user', $id) ) {
+        if ( ! current_user_can( 'remove_user', $id ) ) {
             /* translators: 1: user id, 2: user login */
             echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>Sorry, you are not allowed to remove this user.</strong>'), $id, $user->user_login) . "</li>\n";

trunk/src/wp-includes/capabilities.php

@@ -33 +33 @@
     switch ( $cap ) {
     case 'remove_user':
-        $caps[] = 'remove_users';
+        // In multisite the user must be a super admin to remove themselves.
+        if ( isset( $args[0] ) && $user_id == $args[0] && ! is_super_admin( $user_id ) ) {
+            $caps[] = 'do_not_allow';
+        } else {
+            $caps[] = 'remove_users';
+        }
         break;
     case 'promote_user':

trunk/tests/phpunit/tests/user/capabilities.php

@@ -1758 +1758 @@
         $this->assertFalse( current_user_can( 'add_user_meta', self::$users['subscriber']->ID, 'foo' ) );
     }
+
+    /**
+     * @ticket 39063
+     */
+    public function test_only_super_admins_can_remove_themselves_on_multisite() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( 'Test only runs in multisite.' );
+        }
+
+        $this->assertTrue( user_can( self::$super_admin->ID, 'remove_user', self::$super_admin->ID ) );
+
+        $this->assertFalse( user_can( self::$users['administrator']->ID, 'remove_user', self::$users['administrator']->ID ) );
+        $this->assertFalse( user_can( self::$users['editor']->ID,        'remove_user', self::$users['editor']->ID ) );
+        $this->assertFalse( user_can( self::$users['author']->ID,        'remove_user', self::$users['author']->ID ) );
+        $this->assertFalse( user_can( self::$users['contributor']->ID,   'remove_user', self::$users['contributor']->ID ) );
+        $this->assertFalse( user_can( self::$users['subscriber']->ID,    'remove_user', self::$users['subscriber']->ID ) );
+    }
 }