Changeset 35772

Timestamp:

12/04/2015 11:24:56 PM (11 years ago)

Author:

boonebgorges

Message:

Use 'invalid_username' error code when tripping 'illegal_user_logins'.

This gives us better compatibility with existing errors thrown by
sanitize_user(), especially in Multisite, where user_login has more
restrictions on allowed characters.

Props markjaquith.
Fixes #27317.

Location:

trunk

Files:

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

trunk/src/wp-admin/includes/user.php

@@ -147 +147 @@
 
         if ( in_array( strtolower( $user->user_login ), array_map( 'strtolower', $illegal_logins ) ) ) {
-                $errors->add( 'illegal_user_login', __( '<strong>ERROR</strong>: Sorry, that username is not allowed.' ) );
+                $errors->add( 'invalid_username', __( '<strong>ERROR</strong>: Sorry, that username is not allowed.' ) );
         }
 

trunk/src/wp-includes/user.php

@@ -1332 +1332 @@
 
         if ( in_array( strtolower( $user_login ), array_map( 'strtolower', $illegal_logins ) ) ) {
-                return new WP_Error( 'illegal_user_login', __( 'Sorry, that username is not allowed.' ) );
+                return new WP_Error( 'invalid_username', __( 'Sorry, that username is not allowed.' ) );
         }
 
@@ -2125 +2125 @@
         } elseif ( username_exists( $sanitized_user_login ) ) {
                 $errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) );
+
+        } else {
+                /** This filter is documented in wp-includes/user.php */
+                $illegal_user_logins = array_map( 'strtolower', (array) apply_filters( 'illegal_user_logins', array() ) );
+                if ( in_array( strtolower( $sanitized_user_login ), $illegal_user_logins ) ) {
+                        $errors->add( 'invalid_username', __( '<strong>ERROR</strong>: Sorry, that username is not allowed.' ) );
+                }
         }
 

trunk/tests/phpunit/tests/user.php

@@ -623 +623 @@
                 $response = wp_insert_user( $user_data );
                 $this->assertInstanceOf( 'WP_Error', $response );
-                $this->assertEquals( 'illegal_user_login', $response->get_error_code() );
+                $this->assertEquals( 'invalid_username', $response->get_error_code() );
 
                 remove_filter( 'illegal_user_logins', array( $this, '_illegal_user_logins' ) );
@@ -634 +634 @@
         /**
          * @ticket 27317
+         * @dataProvider _illegal_user_logins_data
+         */
+        function test_illegal_user_logins_single_wp_create_user( $user_login ) {
+                $user_email = 'testuser-' . $user_login . '@example.com';
+
+                add_filter( 'illegal_user_logins', array( $this, '_illegal_user_logins' ) );
+
+                $response = register_new_user( $user_login, $user_email );
+                $this->assertInstanceOf( 'WP_Error', $response );
+                $this->assertEquals( 'invalid_username', $response->get_error_code() );
+
+                remove_filter( 'illegal_user_logins', array( $this, '_illegal_user_logins' ) );
+
+                $response = register_new_user( $user_login, $user_email );
+                $user = get_user_by( 'id', $response );
+                $this->assertInstanceOf( 'WP_User', $user );
+        }
+
+        /**
+         * @ticket 27317
          */
         function test_illegal_user_logins_multisite() {
@@ -659 +679 @@
 
         function _illegal_user_logins_data() {
-                return array(
-                        array( 'testuser' ),
-                        array( 'TestUser' ),
-                );
+                $data = array(
+                        array( 'testuser' )
+                );
+
+                // Multisite doesn't allow mixed case logins ever
+                if ( ! is_multisite() ) {
+                        $data[] = array( 'TestUser' );
+                }
+                return $data;
         }