Changeset 42858

Timestamp:

03/20/2018 07:06:09 PM (7 years ago)

Author:

jeremyfelt

Message:

Multisite: Use case-insensitive check on email domain whitelist.

Props greatislander.
Fixes #43148.

Location:

trunk

Files:

• src/wp-includes/ms-functions.php (modified) (1 diff)
• tests/phpunit/tests/multisite/wpmuValidateUserSignup.php (modified) (1 diff)

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

@@ -498 +498 @@
     $limited_email_domains = get_site_option( 'limited_email_domains' );
     if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
-        $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
-        if ( ! in_array( $emaildomain, $limited_email_domains ) ) {
+        $limited_email_domains = array_map( 'strtolower', $limited_email_domains );
+        $emaildomain = strtolower( substr( $user_email, 1 + strpos( $user_email, '@' ) ) );
+        if ( ! in_array( $emaildomain, $limited_email_domains, true ) ) {
             $errors->add( 'user_email', __( 'Sorry, that email address is not allowed!' ) );
         }

trunk/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php

@@ -61 +61 @@
             $v = wpmu_validate_user_signup( 'foo123', 'foo@example.com' );
             $this->assertContains( 'user_email', $v['errors']->get_error_codes() );
+        }
+
+        public function test_should_not_fail_for_emails_from_whitelisted_domains_with_mixed_case() {
+            $domains = array( 'foo.com', 'bar.org' );
+            update_site_option( 'limited_email_domains', $domains );
+
+            $v = wpmu_validate_user_signup( 'foo123', 'foo@BAR.org' );
+            $this->assertNotContains( 'user_email', $v['errors']->get_error_codes() );
         }