bug #44119 [HttpClient][Mime] Add correct IDN flags for IDNA2008 compliance (j-bernard)

fabpot · fabpot · commit bfc8b1e9869f · 2021-11-19T12:24:32.000+01:00
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [HttpClient][Mime] Add correct IDN flags for IDNA2008 compliance | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #44091 #44092 | License | MIT Fix #44091 Fix #44092 Commits ------- 22d642e [HttpClient][Mime] Add correct IDN flags for IDNA2008 compliance
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -456,7 +456,7 @@ private static function parseUrl(string $url, array $query = [], array $allowedS
                 throw new InvalidArgumentException(sprintf('Unsupported IDN "%s", try enabling the "intl" PHP extension or running "composer require symfony/polyfill-intl-idn".', $host));
             }
 
-            $host = \defined('INTL_IDNA_VARIANT_UTS46') ? idn_to_ascii($host, \IDNA_DEFAULT, \INTL_IDNA_VARIANT_UTS46) ?: strtolower($host) : strtolower($host);
+            $host = \defined('INTL_IDNA_VARIANT_UTS46') ? idn_to_ascii($host, \IDNA_DEFAULT | \IDNA_USE_STD3_RULES | \IDNA_CHECK_BIDI | \IDNA_CHECK_CONTEXTJ | \IDNA_NONTRANSITIONAL_TO_ASCII, \INTL_IDNA_VARIANT_UTS46) ?: strtolower($host) : strtolower($host);
             $host .= $port ? ':'.$port : '';
         }
 
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
@@ -160,6 +160,8 @@ public function provideParseUrl(): iterable
         yield [[null, null, 'bar', '?a%5Bb%5Bc%5D=d', null], 'bar?a[b[c]=d', []];
         yield [[null, null, 'bar', '?a%5Bb%5D%5Bc%5D=dd', null], 'bar?a[b][c]=d&e[f]=g', ['a' => ['b' => ['c' => 'dd']], 'e[f]' => null]];
         yield [[null, null, 'bar', '?a=b&a%5Bb%20c%5D=d&e%3Df=%E2%9C%93', null], 'bar?a=b', ['a' => ['b c' => 'd'], 'e=f' => '✓']];
+        // IDNA 2008 compliance
+        yield [['https:', '//xn--fuball-cta.test', null, null, null], 'https://fußball.test'];
     }
 
     /**
diff --git a/src/Symfony/Component/Mime/Encoder/IdnAddressEncoder.php b/src/Symfony/Component/Mime/Encoder/IdnAddressEncoder.php
@@ -43,7 +43,7 @@ public function encodeString(string $address): string
             }
 
             if (preg_match('/[^\x00-\x7F]/', $domain)) {
-                $address = sprintf('%s@%s', $local, idn_to_ascii($domain, 0, \INTL_IDNA_VARIANT_UTS46));
+                $address = sprintf('%s@%s', $local, idn_to_ascii($domain, \IDNA_DEFAULT | \IDNA_USE_STD3_RULES | \IDNA_CHECK_BIDI | \IDNA_CHECK_CONTEXTJ | \IDNA_NONTRANSITIONAL_TO_ASCII, \INTL_IDNA_VARIANT_UTS46));
             }
         }
 
diff --git a/src/Symfony/Component/Mime/Tests/Encoder/IdnAddressEncoderTest.php b/src/Symfony/Component/Mime/Tests/Encoder/IdnAddressEncoderTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\Mime\Encoder;
+
+use PHPUnit\Framework\TestCase;
+
+class IdnAddressEncoderTest extends TestCase
+{
+    public function testEncodeString()
+    {
+        $this->assertSame('test@xn--fuball-cta.test', (new IdnAddressEncoder())->encodeString('test@fußball.test'));
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ private static function parseUrl(string $url, array $query = [], array $allowedS`
`456`	`456`	`throw new InvalidArgumentException(sprintf('Unsupported IDN "%s", try enabling the "intl" PHP extension or running "composer require symfony/polyfill-intl-idn".', $host));`
`457`	`457`	`}`
`458`	`458`
`459`		`- $host = \defined('INTL_IDNA_VARIANT_UTS46') ? idn_to_ascii($host, \IDNA_DEFAULT, \INTL_IDNA_VARIANT_UTS46) ?: strtolower($host) : strtolower($host);`
	`459`	`+ $host = \defined('INTL_IDNA_VARIANT_UTS46') ? idn_to_ascii($host, \IDNA_DEFAULT \| \IDNA_USE_STD3_RULES \| \IDNA_CHECK_BIDI \| \IDNA_CHECK_CONTEXTJ \| \IDNA_NONTRANSITIONAL_TO_ASCII, \INTL_IDNA_VARIANT_UTS46) ?: strtolower($host) : strtolower($host);`
`460`	`460`	`$host .= $port ? ':'.$port : '';`
`461`	`461`	`}`
`462`	`462`
Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,8 @@ public function provideParseUrl(): iterable`
`160`	`160`	`yield [[null, null, 'bar', '?a%5Bb%5Bc%5D=d', null], 'bar?a[b[c]=d', []];`
`161`	`161`	`yield [[null, null, 'bar', '?a%5Bb%5D%5Bc%5D=dd', null], 'bar?a[b][c]=d&e[f]=g', ['a' => ['b' => ['c' => 'dd']], 'e[f]' => null]];`
`162`	`162`	`yield [[null, null, 'bar', '?a=b&a%5Bb%20c%5D=d&e%3Df=%E2%9C%93', null], 'bar?a=b', ['a' => ['b c' => 'd'], 'e=f' => '✓']];`
	`163`	`+ // IDNA 2008 compliance`
	`164`	`+ yield [['https:', '//xn--fuball-cta.test', null, null, null], 'https://fußball.test'];`
`163`	`165`	`}`
`164`	`166`
`165`	`167`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function encodeString(string $address): string`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`if (preg_match('/[^\x00-\x7F]/', $domain)) {`
`46`		`- $address = sprintf('%s@%s', $local, idn_to_ascii($domain, 0, \INTL_IDNA_VARIANT_UTS46));`
	`46`	`+ $address = sprintf('%s@%s', $local, idn_to_ascii($domain, \IDNA_DEFAULT \| \IDNA_USE_STD3_RULES \| \IDNA_CHECK_BIDI \| \IDNA_CHECK_CONTEXTJ \| \IDNA_NONTRANSITIONAL_TO_ASCII, \INTL_IDNA_VARIANT_UTS46));`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`