Merge branch 'ACP2E-717' of https://github.com/magento-l3/magento2ce into L3-PR-2022-04-19

Author: alzota

lib/internal/Magento/Framework/Mail/AddressConverter.php

@@ -10,7 +10,7 @@
 use Magento\Framework\Mail\Exception\InvalidArgumentException;
 
 /**
- * Class AddressConverter
+ * Convert and filter email addresses
  */
 class AddressConverter
 {
@@ -60,10 +60,14 @@ private function convertEmailUserToAscii(string $email): string
         if (preg_match('/^(.+)@([^@]+)$/', $email, $matches)) {
             $user = $matches[1];
             $hostname = $matches[2];
-            $userEncoded = idn_to_ascii($user, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
+            $userEncoded = idn_to_ascii($user, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46, $idnaInfo);
             if ($userEncoded == $user) {
                 return $email;
             }
+
+            if ($userEncoded === false && array_key_exists('result', $idnaInfo)) {
+                $userEncoded = $idnaInfo['result'];
+            }
             $email = sprintf('%s@%s', $userEncoded, $hostname);
         }
         return $email;

lib/internal/Magento/Framework/Mail/Test/Unit/AddressConverterTest.php

@@ -70,6 +70,18 @@ public function convertDataProvider(): array
                 'name' => 'Test',
                 'emailExpected' => 'xn--tst-bma@example.com',
                 'nameExpected' => 'Test'
+            ],
+            [
+                'email' => 'test.-email@example.com',
+                'name' => 'Test',
+                'emailExpected' => 'test.-email@example.com',
+                'nameExpected' => 'Test'
+            ],
+            [
+                'email' => 'tést.-èmail@example.com',
+                'name' => 'Test',
+                'emailExpected' => 'xn--tst-bma.xn---mail-4ra@example.com',
+                'nameExpected' => 'Test'
             ]
         ];
     }