Changeset 32070

Timestamp:

04/07/2015 08:09:46 PM (9 years ago)

Author:

boonebgorges

Message:

Improve handling of incomplete From and Content-Type headers in wp_mail().

When an incomplete header is provided (eg, 'From' with an email address but no
name), ensure that the WP defaults are filled in properly.

Props valendesigns.
Fixes #30266.

Location:

trunk

Files:

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

trunk/src/wp-includes/pluggable.php

@@ -303 +303 @@
                     // Mainly for legacy -- process a From: header if it's there
                     case 'from':
-                        if ( strpos($content, '<' ) !== false ) {
-                            // So... making my life hard again?
-                            $from_name = substr( $content, 0, strpos( $content, '<' ) - 1 );
-                            $from_name = str_replace( '"', '', $from_name );
-                            $from_name = trim( $from_name );
-
-                            $from_email = substr( $content, strpos( $content, '<' ) + 1 );
+                        $bracket_pos = strpos( $content, '<' );
+                        if ( $bracket_pos !== false ) {
+                            // Text before the bracketed email is the "From" name.
+                            if ( $bracket_pos > 0 ) {
+                                $from_name = substr( $content, 0, $bracket_pos - 1 );
+                                $from_name = str_replace( '"', '', $from_name );
+                                $from_name = trim( $from_name );
+                            }
+
+                            $from_email = substr( $content, $bracket_pos + 1 );
                             $from_email = str_replace( '>', '', $from_email );
                             $from_email = trim( $from_email );
-                        } else {
+
+                        // Avoid setting an empty $from_email.
+                        } elseif ( '' !== trim( $content ) ) {
                             $from_email = trim( $content );
                         }
@@ -318 +323 @@
                     case 'content-type':
                         if ( strpos( $content, ';' ) !== false ) {
-                            list( $type, $charset ) = explode( ';', $content );
+                            list( $type, $charset_content ) = explode( ';', $content );
                             $content_type = trim( $type );
-                            if ( false !== stripos( $charset, 'charset=' ) ) {
-                                $charset = trim( str_replace( array( 'charset=', '"' ), '', $charset ) );
-                            } elseif ( false !== stripos( $charset, 'boundary=' ) ) {
-                                $boundary = trim( str_replace( array( 'BOUNDARY=', 'boundary=', '"' ), '', $charset ) );
+                            if ( false !== stripos( $charset_content, 'charset=' ) ) {
+                                $charset = trim( str_replace( array( 'charset=', '"' ), '', $charset_content ) );
+                            } elseif ( false !== stripos( $charset_content, 'boundary=' ) ) {
+                                $boundary = trim( str_replace( array( 'BOUNDARY=', 'boundary=', '"' ), '', $charset_content ) );
                                 $charset = '';
                             }
-                        } else {
+
+                        // Avoid setting an empty $content_type.
+                        } elseif ( '' !== trim( $content ) ) {
                             $content_type = trim( $content );
                         }

trunk/tests/phpunit/tests/mail.php

@@ -157 +157 @@
         $this->assertFalse( wp_mail( 'invalid.address', 'subject', 'body', '', array() ) );
     }
+
+    /**
+     * @ticket 30266
+     */
+    public function test_wp_mail_with_valid_from_header() {
+        $to       = "address@tld.com";
+        $subject  = "Testing";
+        $message  = "Test Message";
+        $headers  = "From: Foo <bar@example.com>";
+        $expected = "From: Foo <bar@example.com>";
+
+        wp_mail( $to, $subject, $message, $headers );
+
+        $this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
+    }
+
+    /**
+     * @ticket 30266
+     */
+    public function test_wp_mail_with_empty_from_header() {
+        $to       = "address@tld.com";
+        $subject  = "Testing";
+        $message  = "Test Message";
+        $headers  = "From: ";
+        $expected = "From: WordPress <wordpress@example.com>";
+
+        wp_mail( $to, $subject, $message, $headers );
+
+        $this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
+    }
+
+    /**
+     * @ticket 30266
+     */
+    public function test_wp_mail_with_empty_from_name_for_the_from_header() {
+        $to       = "address@tld.com";
+        $subject  = "Testing";
+        $message  = "Test Message";
+        $headers  = "From: <wordpress@example.com>";
+        $expected = "From: WordPress <wordpress@example.com>";
+
+        wp_mail( $to, $subject, $message, $headers );
+
+        $this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
+    }
+
+    /**
+     * @ticket 30266
+     */
+    public function test_wp_mail_with_valid_content_type_header() {
+        $to       = "address@tld.com";
+        $subject  = "Testing";
+        $message  = "Test Message";
+        $headers  = "Content-Type: text/html; charset=iso-8859-1";
+        $expected = "Content-Type: text/html; charset=iso-8859-1";
+
+        wp_mail( $to, $subject, $message, $headers );
+
+        $this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
+    }
+
+    /**
+     * @ticket 30266
+     */
+    public function test_wp_mail_with_empty_content_type_header() {
+        $to       = "address@tld.com";
+        $subject  = "Testing";
+        $message  = "Test Message";
+        $headers  = "Content-Type: ";
+        $expected = "Content-Type: text/plain; charset=UTF-8";
+
+        wp_mail( $to, $subject, $message, $headers );
+
+        $this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
+    }
+
+    /**
+     * @ticket 30266
+     */
+    public function test_wp_mail_with_empty_charset_for_the_content_type_header() {
+        $to       = "address@tld.com";
+        $subject  = "Testing";
+        $message  = "Test Message";
+        $headers  = "Content-Type: text/plain;";
+        $expected = "Content-Type: text/plain; charset=UTF-8";
+
+        wp_mail( $to, $subject, $message, $headers );
+
+        $this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
+    }
 }