Changeset 25197

Timestamp:

08/31/2013 04:35:15 AM (11 years ago)

Author:

nacin

Message:

Case insensitivity for is_email_address_unsafe().

props jkudish.
fixes #25046.

Location:

trunk

Files:

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

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

@@ -380 +380 @@
 
     if ( $banned_names && is_array( $banned_names ) ) {
-        list( $email_local_part, $email_domain ) = explode( '@', $user_email );
+        $banned_names = array_map( 'strtolower', $banned_names );
+        $normalized_email = strtolower( $user_email );
+
+        list( $email_local_part, $email_domain ) = explode( '@', $normalized_email );
 
         foreach ( $banned_names as $banned_domain ) {
@@ -392 +395 @@
 
             $dotted_domain = ".$banned_domain";
-            if ( $dotted_domain === substr( $user_email, -strlen( $dotted_domain ) ) ) {
+            if ( $dotted_domain === substr( $normalized_email, -strlen( $dotted_domain ) ) ) {
                 $is_email_address_unsafe = true;
                 break;

trunk/tests/phpunit/tests/ms.php

@@ -828 +828 @@
      * @ticket 21570
      */
-    function test_is_email_address_unsafe() {
+    function test_aggressiveness_of_is_email_address_unsafe() {
         update_site_option( 'banned_email_domains', array( 'bar.com', 'foo.co' ) );
 
@@ -840 +840 @@
     }
 
+    /**
+     * @ticket 25046
+     */
+    function test_case_sensitivity_of_is_email_address_unsafe() {
+        update_site_option( 'banned_email_domains', array( 'baR.com', 'Foo.co', 'barfoo.COM', 'BAZ.com' ) );
+
+        foreach ( array( 'test@Bar.com', 'tEst@bar.com', 'test@barFoo.com', 'tEst@foo.bar.com', 'test@baz.Com' ) as $email_address ) {
+            $this->assertTrue( is_email_address_unsafe( $email_address ), "$email_address should be UNSAFE" );
+        }
+
+        foreach ( array( 'test@Foobar.com', 'test@Foo-bar.com', 'tEst@foobar.com', 'test@Subdomain.Foo.com', 'test@fooBAz.com' ) as $email_address ) {
+            $this->assertFalse( is_email_address_unsafe( $email_address ), "$email_address should be SAFE" );
+        }
+
+    }
     /**
      * @ticket 21552