Changeset 48645

Timestamp:

07/27/2020 08:17:36 PM (5 years ago)

Author:

whyisjake

Message:

Mail: PHPMailer swap to use is_email for the default validator.

Prior to the PHPMailer update in 5.5, old version of the PHPMailer was setting the validator to 'auto' resulting in a sophisticated logic for determining what email address validation should be used. But the new version defaults to 'php', possibly leading to rejection of email addresses which were fine prior to the upgrade. Let's use the WordPress core function is_email() so that it can be fully pluggable.

Fixes #50720.
Props david.binda, ayeshrajans, Synchro, SergeyBiryukov, whyisjake.

Location:

trunk

Files:

• src/wp-includes/pluggable.php (modified) (1 diff)
• tests/phpunit/includes/mock-mailer.php (modified) (1 diff)
• tests/phpunit/tests/mail.php (modified) (1 diff)

trunk/src/wp-includes/pluggable.php

@@ -217 +217 @@
             require_once ABSPATH . WPINC . '/PHPMailer/Exception.php';
             $phpmailer = new PHPMailer\PHPMailer\PHPMailer( true );
+
+            $phpmailer::$validator = static function ( $email ) {
+                return (bool) is_email( $email );
+            };
         }
 

trunk/tests/phpunit/includes/mock-mailer.php

@@ -97 +97 @@
     $mailer = tests_retrieve_phpmailer_instance();
     if ( $mailer ) {
-        $GLOBALS['phpmailer'] = new MockPHPMailer( true );
+        $mailer             = new MockPHPMailer( true );
+        $mailer::$validator = static function ( $email ) {
+            return (bool) is_email( $email );
+        };
+
+        $GLOBALS['phpmailer'] = $mailer;
         return true;
     }

trunk/tests/phpunit/tests/mail.php

@@ -408 +408 @@
         $this->assertEquals( $expected_error_data, $call_args[0]->get_error_data() );
     }
+
+    /**
+     * @ticket 50720
+     */
+    function test_phpmailer_validator() {
+        $phpmailer = $GLOBALS['phpmailer'];
+        $this->assertTrue( $phpmailer->validateAddress( 'foo@192.168.1.1' ), 'Assert PHPMailer accepts IP address email addresses' );
+    }
 }