Ticket #31992: 31992-icann.patch

src/wp-includes/formatting.php

@@ -3489 +3489 @@
 /**
  * Verifies that an email is valid.
  *
- * Does not grok i18n domains. Not RFC compliant.
+ * The mostly matches what people think is the format of email
+ * addresses, and is close to all three current specifications.
+ *
+ * Email address syntax is specified in RFC 5322 for ASCII-only email
+ * and in RFC 6532 for unicode email (both unicode domains and
+ * localparts). In addition, the HTML WHATWG specification contains a
+ * third syntax which is used for HTML form input (except that major
+ * browsers deviate a little from the WHATWG specification).
+ *
+ * This function matches the WHATWG and RFC 6532 specifications fairly
+ * well, although there are some differences.  " "@example.com (quote
+ * space quote at ...) is allowed by the RFCs and rejected by this
+ * code, while ..@example.com is allowed by this code and prohibited
+ * by the RFCs. info@grå.org is allowed by this code and major
+ * browsers, but prohibited by WHATWG's regex (as of April 2023).
  *
  * @since 0.71
  *
@@ -3531 +3545 @@
 
         // LOCAL PART
         // Test for invalid characters.
-        if ( ! preg_match( '/^[a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]+$/', $local ) ) {
+        if ( ! ( preg_match( '/^[a-zA-Z0-9\x80-\xff!#$%&\'*+\/=?^_`{|}~\.-]+$/', $local ) &&
+                 preg_match( '/^\X+$/', $local ) ) ) {
                 /** This filter is documented in wp-includes/formatting.php */
                 return apply_filters( 'is_email', false, $email, 'local_invalid_chars' );
         }
@@ -3567 +3582 @@
                 }
 
                 // Test for invalid characters.
-                if ( ! preg_match( '/^[a-z0-9-]+$/i', $sub ) ) {
+                if ( ! ( preg_match( '/^[a-z0-9\x80-\xff-]+$/i', $sub ) &&
+                         preg_match( '/^\X+$/', $sub ) ) ) {
                         /** This filter is documented in wp-includes/formatting.php */
                         return apply_filters( 'is_email', false, $email, 'sub_invalid_chars' );
                 }

tests/phpunit/tests/formatting/isEmail.php

@@ -14 +14 @@
                         'kevin@many.subdomains.make.a.happy.man.edu',
                         'a@b.co',
                         'bill+ted@example.com',
+                        'info@grå.org',
+                        'grå@grå.org',
+                        "gr\u{0061}\u{030a}blå@grå.org",
+                        '..@example.com',
                 );
                 foreach ( $data as $datum ) {
                         $this->assertSame( $datum, is_email( $datum ), $datum );
@@ -28 +32 @@
                         'com.exampleNOSPAMbob',
                         'bob@your mom',
                         'a@b.c',
+                        '" "@b.c',
                 );
                 foreach ( $data as $datum ) {
                         $this->assertFalse( is_email( $datum ), $datum );