Changeset 34856

Timestamp:

10/06/2015 05:34:47 AM (11 years ago)

Author:

DrewAPicture

Message:

Users: Empty sanitized usernames should be considered invalid when passed through validate_username().

Adds tests.

Props gwinhlopez for the initial patch.
Props mordauk, chriscct7.
Fixes #24618.

Location:

trunk

Files:

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

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

@@ -1177 +1177 @@
  *
  * @since 2.0.1
+ * @since 4.4.0 Empty sanitized usernames are now considered invalid
  *
  * @param string $username Username.
@@ -1183 +1184 @@
 function validate_username( $username ) {
         $sanitized = sanitize_user( $username, true );
-        $valid = ( $sanitized == $username );
+        $valid = ( $sanitized == $username && ! empty( $sanitized ) );
+
         /**
          * Filter whether the provided username is valid or not.

trunk/tests/phpunit/tests/user.php

@@ -598 +598 @@
                         }
                 }
+        }
+
+        /**
+         * @ticket 24618
+         */
+        public function test_validate_username_string() {
+                $this->assertTrue( validate_username( rand_str() ) );
+                $this->assertTrue( validate_username( 'JohnDoe' ) );
+                $this->assertTrue( validate_username( 'test@test.com' ) );
+        }
+
+        /**
+         * @ticket 24618
+         */
+        public function test_validate_username_empty() {
+                $this->assertFalse( validate_username( '' ) );
+        }
+
+        /**
+         * @ticket 24618
+         */
+        public function test_validate_username_invalid() {
+                $this->assertFalse( validate_username( '@#&99sd' ) );
         }