[Mime] allow non-ASCII characters in local part of email

dmaicher · dmaicher · commit 2a1e6b06bcf5 · 2020-03-23T13:44:31.000+01:00
diff --git a/src/Symfony/Component/Mime/Encoder/IdnAddressEncoder.php b/src/Symfony/Component/Mime/Encoder/IdnAddressEncoder.php
@@ -11,25 +11,21 @@
 
 namespace Symfony\Component\Mime\Encoder;
 
-use Symfony\Component\Mime\Exception\AddressEncoderException;
-
 /**
  * An IDN email address encoder.
  *
  * Encodes the domain part of an address using IDN. This is compatible will all
  * SMTP servers.
  *
- * This encoder does not support email addresses with non-ASCII characters in
- * local-part (the substring before @).
+ * Note: It leaves the local part as is. In case there are non-ASCII characters
+ * in the local part then it depends on the SMTP Server if this is supported.
  *
  * @author Christian Schmidt
  */
 final class IdnAddressEncoder implements AddressEncoderInterface
 {
     /**
      * Encodes the domain part of an address using IDN.
-     *
-     * @throws AddressEncoderException If local-part contains non-ASCII characters
      */
     public function encodeString(string $address): string
     {
@@ -38,10 +34,6 @@ public function encodeString(string $address): string
             $local = substr($address, 0, $i);
             $domain = substr($address, $i + 1);
 
-            if (preg_match('/[^\x00-\x7F]/', $local)) {
-                throw new AddressEncoderException(sprintf('Non-ASCII characters not supported in local-part os "%s".', $address));
-            }
-
             if (preg_match('/[^\x00-\x7F]/', $domain)) {
                 $address = sprintf('%s@%s', $local, idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46));
             }
diff --git a/src/Symfony/Component/Mime/Tests/Header/MailboxHeaderTest.php b/src/Symfony/Component/Mime/Tests/Header/MailboxHeaderTest.php
@@ -58,11 +58,10 @@ public function testgetBodyAsString()
         $this->assertEquals('Fabien =?'.$header->getCharset().'?Q?P=8Ftencier?= <fabien@symfony.com>', $header->getBodyAsString());
     }
 
-    public function testUtf8CharsInLocalPartThrows()
+    public function testUtf8CharsInLocalPart()
     {
-        $this->expectException('Symfony\Component\Mime\Exception\AddressEncoderException');
         $header = new MailboxHeader('Sender', new Address('fabïen@symfony.com'));
-        $header->getBodyAsString();
+        $this->assertSame('fabïen@symfony.com', $header->getBodyAsString());
     }
 
     public function testToString()
diff --git a/src/Symfony/Component/Mime/Tests/Header/MailboxListHeaderTest.php b/src/Symfony/Component/Mime/Tests/Header/MailboxListHeaderTest.php
@@ -55,11 +55,10 @@ public function testUtf8CharsInDomainAreIdnEncoded()
         $this->assertEquals(['Chris Corbyn <chris@xn--swftmailer-78a.org>'], $header->getAddressStrings());
     }
 
-    public function testUtf8CharsInLocalPartThrows()
+    public function testUtf8CharsInLocalPart()
     {
-        $this->expectException('Symfony\Component\Mime\Exception\AddressEncoderException');
         $header = new MailboxListHeader('From', [new Address('chrïs@swiftmailer.org', 'Chris Corbyn')]);
-        $header->getAddressStrings();
+        $this->assertSame(['Chris Corbyn <chrïs@swiftmailer.org>'], $header->getAddressStrings());
     }
 
     public function testGetMailboxesReturnsNameValuePairs()
diff --git a/src/Symfony/Component/Mime/Tests/Header/PathHeaderTest.php b/src/Symfony/Component/Mime/Tests/Header/PathHeaderTest.php
@@ -49,11 +49,10 @@ public function testAddressIsIdnEncoded()
         $this->assertEquals('<chris@xn--swftmailer-78a.org>', $header->getBodyAsString());
     }
 
-    public function testAddressMustBeEncodable()
+    public function testAddressMustBeEncodableWithUtf8CharsInLocalPart()
     {
-        $this->expectException('Symfony\Component\Mime\Exception\AddressEncoderException');
         $header = new PathHeader('Return-Path', new Address('chrïs@swiftmailer.org'));
-        $header->getBodyAsString();
+        $this->assertSame('<chrïs@swiftmailer.org>', $header->getBodyAsString());
     }
 
     public function testSetBody()

Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,10 @@ public function testgetBodyAsString()`
`58`	`58`	`$this->assertEquals('Fabien =?'.$header->getCharset().'?Q?P=8Ftencier?= <fabien@symfony.com>', $header->getBodyAsString());`
`59`	`59`	`}`
`60`	`60`
`61`		`- public function testUtf8CharsInLocalPartThrows()`
	`61`	`+ public function testUtf8CharsInLocalPart()`
`62`	`62`	`{`
`63`		`- $this->expectException('Symfony\Component\Mime\Exception\AddressEncoderException');`
`64`	`63`	`$header = new MailboxHeader('Sender', new Address('fabïen@symfony.com'));`
`65`		`- $header->getBodyAsString();`
	`64`	`+ $this->assertSame('fabïen@symfony.com', $header->getBodyAsString());`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`public function testToString()`
Original file line number	Diff line number	Diff line change
`@@ -55,11 +55,10 @@ public function testUtf8CharsInDomainAreIdnEncoded()`
`55`	`55`	`$this->assertEquals(['Chris Corbyn <chris@xn--swftmailer-78a.org>'], $header->getAddressStrings());`
`56`	`56`	`}`
`57`	`57`
`58`		`- public function testUtf8CharsInLocalPartThrows()`
	`58`	`+ public function testUtf8CharsInLocalPart()`
`59`	`59`	`{`
`60`		`- $this->expectException('Symfony\Component\Mime\Exception\AddressEncoderException');`
`61`	`60`	`$header = new MailboxListHeader('From', [new Address('chrïs@swiftmailer.org', 'Chris Corbyn')]);`
`62`		`- $header->getAddressStrings();`
	`61`	`+ $this->assertSame(['Chris Corbyn <chrïs@swiftmailer.org>'], $header->getAddressStrings());`
`63`	`62`	`}`
`64`	`63`
`65`	`64`	`public function testGetMailboxesReturnsNameValuePairs()`
Original file line number	Diff line number	Diff line change
`@@ -49,11 +49,10 @@ public function testAddressIsIdnEncoded()`
`49`	`49`	`$this->assertEquals('<chris@xn--swftmailer-78a.org>', $header->getBodyAsString());`
`50`	`50`	`}`
`51`	`51`
`52`		`- public function testAddressMustBeEncodable()`
	`52`	`+ public function testAddressMustBeEncodableWithUtf8CharsInLocalPart()`
`53`	`53`	`{`
`54`		`- $this->expectException('Symfony\Component\Mime\Exception\AddressEncoderException');`
`55`	`54`	`$header = new PathHeader('Return-Path', new Address('chrïs@swiftmailer.org'));`
`56`		`- $header->getBodyAsString();`
	`55`	`+ $this->assertSame('<chrïs@swiftmailer.org>', $header->getBodyAsString());`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`public function testSetBody()`