Ticket #15409: 15409.diff

Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php   (revision 16332)
+++ wp-includes/functions.php   (working copy)
@@ -4434,3 +4434,16 @@
        $show_admin_bar = (bool) $show;
 }
 
+/**
+ * Checks if a value ends in a valid TLD
+ *
+ * TLD list as per http://data.iana.org/TLD/tlds-alpha-by-domain.txt
+ *
+ * @since 3.1.0
+ *
+ * @param string $value Any string, usually a [sub]domain, email address, etc.
+ * @return boolean
+ */
+function ends_with_valid_tld( $value ) {
+       return preg_match( '/\.(AC|AD|AE|AERO|AF|AG|AI|AL|AM|AN|AO|AQ|AR|ARPA|AS|ASIA|AT|AU|AW|AX|AZ|BA|BB|BD|BE|BF|BG|BH|BI|BIZ|BJ|BM|BN|BO|BR|BS|BT|BV|BW|BY|BZ|CA|CAT|CC|CD|CF|CG|CH|CI|CK|CL|CM|CN|CO|COM|COOP|CR|CU|CV|CX|CY|CZ|DE|DJ|DK|DM|DO|DZ|EC|EDU|EE|EG|ER|ES|ET|EU|FI|FJ|FK|FM|FO|FR|GA|GB|GD|GE|GF|GG|GH|GI|GL|GM|GN|GOV|GP|GQ|GR|GS|GT|GU|GW|GY|HK|HM|HN|HR|HT|HU|ID|IE|IL|IM|IN|INFO|INT|IO|IQ|IR|IS|IT|JE|JM|JO|JOBS|JP|KE|KG|KH|KI|KM|KN|KP|KR|KW|KY|KZ|LA|LB|LC|LI|LK|LR|LS|LT|LU|LV|LY|MA|MC|MD|ME|MG|MH|MIL|MK|ML|MM|MN|MO|MOBI|MP|MQ|MR|MS|MT|MU|MUSEUM|MV|MW|MX|MY|MZ|NA|NAME|NC|NE|NET|NF|NG|NI|NL|NO|NP|NR|NU|NZ|OM|ORG|PA|PE|PF|PG|PH|PK|PL|PM|PN|PR|PRO|PS|PT|PW|PY|QA|RE|RO|RS|RU|RW|SA|SB|SC|SD|SE|SG|SH|SI|SJ|SK|SL|SM|SN|SO|SR|ST|SU|SV|SY|SZ|TC|TD|TEL|TF|TG|TH|TJ|TK|TL|TM|TN|TO|TP|TR|TRAVEL|TT|TV|TW|TZ|UA|UG|UK|US|UY|UZ|VA|VC|VE|VG|VI|VN|VU|WF|WS|XN--0ZWM56D|测试|XN--11B5BS3A9AJ6G|परीक्षा|XN--80AKHBYKNJ4F|испытание|XN--9T4B11YI5A|테스트|XN--DEBA0AD|טעסט|XN--G6W251D|測試|XN--HGBK6AJ7F53BBA|آزمایشی|XN--HLCJ6AYA9ESC7A|பரிட்சை|XN--JXALPDLP|δοκιμή|XN--KGBECHTV|إختبار|XN--ZCKZAH|テスト|YE|YT|YU|ZA|ZM|ZW)$/iu', $value );
+}
\ No newline at end of file
Index: wp-includes/formatting.php
===================================================================
--- wp-includes/formatting.php  (revision 16332)
+++ wp-includes/formatting.php  (working copy)
@@ -1534,6 +1534,11 @@
        if ( strpos( $email, '@', 1 ) === false ) {
                return apply_filters( 'is_email', false, $email, 'email_no_at' );
        }
+       
+       // Test for a valid top-level domain (TLD)
+       if ( ! ends_with_valid_tld( $email ) ) {
+               return apply_filters( 'is_email', false, $email, 'domain_invalid_tld' );
+       }
 
        // Split out the local and domain parts
        list( $local, $domain ) = explode( '@', $email, 2 );
@@ -1755,6 +1760,11 @@
        if ( strpos( $email, '@', 1 ) === false ) {
                return apply_filters( 'sanitize_email', '', $email, 'email_no_at' );
        }
+       
+       // Test for a valid top-level domain (TLD)
+       if ( ! ends_with_valid_tld( $email ) ) {
+               return apply_filters( 'sanitize_email', '', $email, 'domain_invalid_tld' );
+       }
 
        // Split out the local and domain parts
        list( $local, $domain ) = explode( '@', $email, 2 );