Merge branch '7.1' into 7.2

nicolas-grekas · nicolas-grekas · commit 3fb1d0f95bd8 · 2024-11-19T11:04:01.000+01:00
* 7.1: [HttpClient] Fix option "resolve" with IPv6 addresses Fix twig deprecations in web profiler twig files [HttpClient] Fix option "bindto" with IPv6 addresses fixes symfony#58904 [Validator] review italian translations [Validator] review latvian translations
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/notifier.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/notifier.html.twig
@@ -138,7 +138,7 @@
                                                             {{- 'Content: ' ~ notification.getContent() }}<br/>
                                                             {{- 'Importance: ' ~ notification.getImportance() }}<br/>
                                                             {{- 'Emoji: ' ~ (notification.getEmoji() is empty ? '(empty)' : notification.getEmoji()) }}<br/>
-                                                            {{- 'Exception: ' ~ notification.getException() ?? '(empty)' }}<br/>
+                                                            {{- 'Exception: ' ~ (notification.getException() ?? '(empty)') }}<br/>
                                                             {{- 'ExceptionAsString: ' ~ (notification.getExceptionAsString() is empty ? '(empty)' : notification.getExceptionAsString()) }}
                                                         </pre>
                                                     </div>
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -278,7 +278,7 @@ public function request(string $method, string $url, array $options = []): Respo
             if (file_exists($options['bindto'])) {
                 $curlopts[\CURLOPT_UNIX_SOCKET_PATH] = $options['bindto'];
             } elseif (!str_starts_with($options['bindto'], 'if!') && preg_match('/^(.*):(\d+)$/', $options['bindto'], $matches)) {
-                $curlopts[\CURLOPT_INTERFACE] = $matches[1];
+                $curlopts[\CURLOPT_INTERFACE] = trim($matches[1], '[]');
                 $curlopts[\CURLOPT_LOCALPORT] = $matches[2];
             } else {
                 $curlopts[\CURLOPT_INTERFACE] = $options['bindto'];
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -206,7 +206,14 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
         if ($resolve = $options['resolve'] ?? false) {
             $options['resolve'] = [];
             foreach ($resolve as $k => $v) {
-                $options['resolve'][substr(self::parseUrl('http://'.$k)['authority'], 2)] = (string) $v;
+                if ('' === $v = (string) $v) {
+                    throw new InvalidArgumentException(sprintf('Option "resolve" for host "%s" cannot be empty.', $k));
+                }
+                if ('[' === $v[0] && ']' === substr($v, -1) && str_contains($v, ':')) {
+                    $v = substr($v, 1, -1);
+                }
+
+                $options['resolve'][substr(self::parseUrl('http://'.$k)['authority'], 2)] = $v;
             }
         }
 
@@ -229,7 +236,14 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
 
         if ($resolve = $defaultOptions['resolve'] ?? false) {
             foreach ($resolve as $k => $v) {
-                $options['resolve'] += [substr(self::parseUrl('http://'.$k)['authority'], 2) => (string) $v];
+                if ('' === $v = (string) $v) {
+                    throw new InvalidArgumentException(sprintf('Option "resolve" for host "%s" cannot be empty.', $k));
+                }
+                if ('[' === $v[0] && ']' === substr($v, -1) && str_contains($v, ':')) {
+                    $v = substr($v, 1, -1);
+                }
+
+                $options['resolve'] += [substr(self::parseUrl('http://'.$k)['authority'], 2) => $v];
             }
         }
 
diff --git a/src/Symfony/Component/HttpClient/Internal/AmpListenerV4.php b/src/Symfony/Component/HttpClient/Internal/AmpListenerV4.php
@@ -81,12 +81,12 @@ public function startTlsNegotiation(Request $request): Promise
     public function startSendingRequest(Request $request, Stream $stream): Promise
     {
         $host = $stream->getRemoteAddress()->getHost();
+        $this->info['primary_ip'] = $host;
 
         if (str_contains($host, ':')) {
             $host = '['.$host.']';
         }
 
-        $this->info['primary_ip'] = $host;
         $this->info['primary_port'] = $stream->getRemoteAddress()->getPort();
         $this->info['pretransfer_time'] = microtime(true) - $this->info['start_time'];
         $this->info['debug'] .= \sprintf("* Connected to %s (%s) port %d\n", $request->getUri()->getHost(), $host, $this->info['primary_port']);
diff --git a/src/Symfony/Component/HttpClient/Internal/AmpResolverV4.php b/src/Symfony/Component/HttpClient/Internal/AmpResolverV4.php
@@ -32,19 +32,31 @@ public function __construct(
 
     public function resolve(string $name, ?int $typeRestriction = null): Promise
     {
-        if (!isset($this->dnsMap[$name]) || !\in_array($typeRestriction, [Record::A, null], true)) {
+        $recordType = Record::A;
+        $ip = $this->dnsMap[$name] ?? null;
+
+        if (null !== $ip && str_contains($ip, ':')) {
+            $recordType = Record::AAAA;
+        }
+        if (null === $ip || $recordType !== ($typeRestriction ?? $recordType)) {
             return Dns\resolver()->resolve($name, $typeRestriction);
         }
 
-        return new Success([new Record($this->dnsMap[$name], Record::A, null)]);
+        return new Success([new Record($ip, $recordType, null)]);
     }
 
     public function query(string $name, int $type): Promise
     {
-        if (!isset($this->dnsMap[$name]) || Record::A !== $type) {
+        $recordType = Record::A;
+        $ip = $this->dnsMap[$name] ?? null;
+
+        if (null !== $ip && str_contains($ip, ':')) {
+            $recordType = Record::AAAA;
+        }
+        if (null === $ip || $recordType !== $type) {
             return Dns\resolver()->query($name, $type);
         }
 
-        return new Success([new Record($this->dnsMap[$name], Record::A, null)]);
+        return new Success([new Record($ip, $recordType, null)]);
     }
 }
diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php
@@ -80,6 +80,9 @@ public function request(string $method, string $url, array $options = []): Respo
             if (str_starts_with($options['bindto'], 'host!')) {
                 $options['bindto'] = substr($options['bindto'], 5);
             }
+            if ((\PHP_VERSION_ID < 80223 || 80300 <= \PHP_VERSION_ID && 80311 < \PHP_VERSION_ID) && '\\' === \DIRECTORY_SEPARATOR && '[' === $options['bindto'][0]) {
+                $options['bindto'] = preg_replace('{^\[[^\]]++\]}', '[$0]', $options['bindto']);
+            }
         }
 
         $hasContentLength = isset($options['normalized_headers']['content-length']);
@@ -334,29 +337,35 @@ private static function parseHostPort(array $url, array &$info): array
      */
     private static function dnsResolve(string $host, NativeClientState $multi, array &$info, ?\Closure $onProgress): string
     {
-        if (null === $ip = $multi->dnsCache[$host] ?? null) {
+        $flag = '' !== $host && '[' === $host[0] && ']' === $host[-1] && str_contains($host, ':') ? \FILTER_FLAG_IPV6 : \FILTER_FLAG_IPV4;
+        $ip = \FILTER_FLAG_IPV6 === $flag ? substr($host, 1, -1) : $host;
+
+        if (filter_var($ip, \FILTER_VALIDATE_IP, $flag)) {
+            // The host is already an IP address
+        } elseif (null === $ip = $multi->dnsCache[$host] ?? null) {
             $info['debug'] .= "* Hostname was NOT found in DNS cache\n";
             $now = microtime(true);
 
             if (!$ip = gethostbynamel($host)) {
                 throw new TransportException(\sprintf('Could not resolve host "%s".', $host));
             }
 
-            $info['namelookup_time'] = microtime(true) - ($info['start_time'] ?: $now);
             $multi->dnsCache[$host] = $ip = $ip[0];
             $info['debug'] .= "* Added {$host}:0:{$ip} to DNS cache\n";
         } else {
             $info['debug'] .= "* Hostname was found in DNS cache\n";
+            $host = str_contains($ip, ':') ? "[$ip]" : $ip;
         }
 
+        $info['namelookup_time'] = microtime(true) - ($info['start_time'] ?: $now);
         $info['primary_ip'] = $ip;
 
         if ($onProgress) {
             // Notify DNS resolution
             $onProgress();
         }
 
-        return $ip;
+        return $host;
     }
 
     /**
diff --git a/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php
@@ -33,20 +33,6 @@ protected function getHttpClient(string $testCase): HttpClientInterface
         return new CurlHttpClient(['verify_peer' => false, 'verify_host' => false], 6, 50);
     }
 
-    public function testBindToPort()
-    {
-        $client = $this->getHttpClient(__FUNCTION__);
-        $response = $client->request('GET', 'http://localhost:8057', ['bindto' => '127.0.0.1:9876']);
-        $response->getStatusCode();
-
-        $r = new \ReflectionProperty($response, 'handle');
-
-        $curlInfo = curl_getinfo($r->getValue($response));
-
-        self::assertSame('127.0.0.1', $curlInfo['local_ip']);
-        self::assertSame(9876, $curlInfo['local_port']);
-    }
-
     public function testTimeoutIsNotAFatalError()
     {
         if ('\\' === \DIRECTORY_SEPARATOR) {
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.lv.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.lv.xlf
@@ -76,7 +76,7 @@
             </trans-unit>
             <trans-unit id="20">
                 <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
-                <target>Pārāk daudz neveiksmīgu autentifikācijas mēģinājumu, lūdzu, mēģiniet vēlreiz pēc %minutes% minūtes.|Pārāk daudz neveiksmīgu autentifikācijas mēģinājumu, lūdzu, mēģiniet vēlreiz pēc %minutes% minūtēm.</target>
+                <target>Pārāk daudz neveiksmīgu autentifikācijas mēģinājumu, lūdzu, mēģiniet vēlreiz pēc %minutes% minūtēm.</target>
             </trans-unit>
         </body>
     </file>
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf
@@ -444,27 +444,27 @@
             </trans-unit>
             <trans-unit id="114">
                 <source>This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</source>
-                <target state="needs-translation">This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</target>
+                <target>Questo valore è troppo corto. Dovrebbe contenere almeno una parola.|Questo valore è troppo corto. Dovrebbe contenere almeno {{ min }} parole.</target>
             </trans-unit>
             <trans-unit id="115">
                 <source>This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</source>
-                <target state="needs-translation">This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</target>
+                <target>Questo valore è troppo lungo. Dovrebbe contenere una parola.|Questo valore è troppo lungo. Dovrebbe contenere {{ max }} parole o meno.</target>
             </trans-unit>
             <trans-unit id="116">
                 <source>This value does not represent a valid week in the ISO 8601 format.</source>
-                <target state="needs-translation">This value does not represent a valid week in the ISO 8601 format.</target>
+                <target>Questo valore non rappresenta una settimana valida nel formato ISO 8601.</target>
             </trans-unit>
             <trans-unit id="117">
                 <source>This value is not a valid week.</source>
-                <target state="needs-translation">This value is not a valid week.</target>
+                <target>Questo valore non è una settimana valida.</target>
             </trans-unit>
             <trans-unit id="118">
                 <source>This value should not be before week "{{ min }}".</source>
-                <target state="needs-translation">This value should not be before week "{{ min }}".</target>
+                <target>Questo valore non dovrebbe essere prima della settimana "{{ min }}".</target>
             </trans-unit>
             <trans-unit id="119">
                 <source>This value should not be after week "{{ max }}".</source>
-                <target state="needs-translation">This value should not be after week "{{ max }}".</target>
+                <target>Questo valore non dovrebbe essere dopo la settimana "{{ max }}".</target>
             </trans-unit>
         </body>
     </file>
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.lv.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.lv.xlf
@@ -452,19 +452,19 @@
             </trans-unit>
             <trans-unit id="116">
                 <source>This value does not represent a valid week in the ISO 8601 format.</source>
-                <target state="needs-translation">This value does not represent a valid week in the ISO 8601 format.</target>
+                <target>Šī vērtība neatspoguļo nedēļu ISO 8601 formatā.</target>
             </trans-unit>
             <trans-unit id="117">
                 <source>This value is not a valid week.</source>
-                <target state="needs-translation">This value is not a valid week.</target>
+                <target>Šī vērtība nav derīga nedēļa.</target>
             </trans-unit>
             <trans-unit id="118">
                 <source>This value should not be before week "{{ min }}".</source>
-                <target state="needs-translation">This value should not be before week "{{ min }}".</target>
+                <target>Šai vērtībai nevajadzētu būt pirms "{{ min }}" nedēļas.</target>
             </trans-unit>
             <trans-unit id="119">
                 <source>This value should not be after week "{{ max }}".</source>
-                <target state="needs-translation">This value should not be after week "{{ max }}".</target>
+                <target>Šai vērtībai nevajadzētu būt pēc "{{ max }}" nedēļas.</target>
             </trans-unit>
         </body>
     </file>
diff --git a/src/Symfony/Contracts/HttpClient/Test/Fixtures/web/index.php b/src/Symfony/Contracts/HttpClient/Test/Fixtures/web/index.php
@@ -12,20 +12,26 @@
     $_POST['content-type'] = $_SERVER['HTTP_CONTENT_TYPE'] ?? '?';
 }
 
+$headers = [
+    'SERVER_PROTOCOL',
+    'SERVER_NAME',
+    'REQUEST_URI',
+    'REQUEST_METHOD',
+    'PHP_AUTH_USER',
+    'PHP_AUTH_PW',
+    'REMOTE_ADDR',
+    'REMOTE_PORT',
+];
+
+foreach ($headers as $k) {
+    if (isset($_SERVER[$k])) {
+        $vars[$k] = $_SERVER[$k];
+    }
+}
+
 foreach ($_SERVER as $k => $v) {
-    switch ($k) {
-        default:
-            if (!str_starts_with($k, 'HTTP_')) {
-                continue 2;
-            }
-            // no break
-        case 'SERVER_NAME':
-        case 'SERVER_PROTOCOL':
-        case 'REQUEST_URI':
-        case 'REQUEST_METHOD':
-        case 'PHP_AUTH_USER':
-        case 'PHP_AUTH_PW':
-            $vars[$k] = $v;
+    if (str_starts_with($k, 'HTTP_')) {
+        $vars[$k] = $v;
     }
 }
 
diff --git a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php
@@ -37,6 +37,7 @@ public static function tearDownAfterClass(): void
     {
         TestHttpServer::stop(8067);
         TestHttpServer::stop(8077);
+        TestHttpServer::stop(8087);
     }
 
     abstract protected function getHttpClient(string $testCase): HttpClientInterface;
@@ -735,6 +736,18 @@ public function testIdnResolve()
         $this->assertSame(200, $response->getStatusCode());
     }
 
+    public function testIPv6Resolve()
+    {
+        TestHttpServer::start(-8087, '[::1]');
+
+        $client = $this->getHttpClient(__FUNCTION__);
+        $response = $client->request('GET', 'http://symfony.com:8087/', [
+            'resolve' => ['symfony.com' => '::1'],
+        ]);
+
+        $this->assertSame(200, $response->getStatusCode());
+    }
+
     public function testNotATimeout()
     {
         $client = $this->getHttpClient(__FUNCTION__);
@@ -1152,4 +1165,33 @@ public function testWithOptions()
         $response = $client2->request('GET', '/');
         $this->assertSame(200, $response->getStatusCode());
     }
+
+    public function testBindToPort()
+    {
+        $client = $this->getHttpClient(__FUNCTION__);
+        $response = $client->request('GET', 'http://localhost:8057', ['bindto' => '127.0.0.1:9876']);
+        $response->getStatusCode();
+
+        $vars = $response->toArray();
+
+        self::assertSame('127.0.0.1', $vars['REMOTE_ADDR']);
+        self::assertSame('9876', $vars['REMOTE_PORT']);
+    }
+
+    public function testBindToPortV6()
+    {
+        TestHttpServer::start(-8087);
+
+        $client = $this->getHttpClient(__FUNCTION__);
+        $response = $client->request('GET', 'http://[::1]:8087', ['bindto' => '[::1]:9876']);
+        $response->getStatusCode();
+
+        $vars = $response->toArray();
+
+        self::assertSame('::1', $vars['REMOTE_ADDR']);
+
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            self::assertSame('9876', $vars['REMOTE_PORT']);
+        }
+    }
 }
diff --git a/src/Symfony/Contracts/HttpClient/Test/TestHttpServer.php b/src/Symfony/Contracts/HttpClient/Test/TestHttpServer.php
@@ -25,6 +25,13 @@ public static function start(int $port = 8057/* , ?string $workingDirectory = nu
     {
         $workingDirectory = \func_get_args()[1] ?? __DIR__.'/Fixtures/web';
 
+        if (0 > $port) {
+            $port = -$port;
+            $ip = '[::1]';
+        } else {
+            $ip = '127.0.0.1';
+        }
+
         if (isset(self::$process[$port])) {
             self::$process[$port]->stop();
         } else {
@@ -34,14 +41,14 @@ public static function start(int $port = 8057/* , ?string $workingDirectory = nu
         }
 
         $finder = new PhpExecutableFinder();
-        $process = new Process(array_merge([$finder->find(false)], $finder->findArguments(), ['-dopcache.enable=0', '-dvariables_order=EGPCS', '-S', '127.0.0.1:'.$port]));
+        $process = new Process(array_merge([$finder->find(false)], $finder->findArguments(), ['-dopcache.enable=0', '-dvariables_order=EGPCS', '-S', $ip.':'.$port]));
         $process->setWorkingDirectory($workingDirectory);
         $process->start();
         self::$process[$port] = $process;
 
         do {
             usleep(50000);
-        } while (!@fopen('http://127.0.0.1:'.$port, 'r'));
+        } while (!@fopen('http://'.$ip.':'.$port, 'r'));
 
         return $process;
     }

Original file line number	Diff line number	Diff line change
`@@ -81,12 +81,12 @@ public function startTlsNegotiation(Request $request): Promise`
`81`	`81`	`public function startSendingRequest(Request $request, Stream $stream): Promise`
`82`	`82`	`{`
`83`	`83`	`$host = $stream->getRemoteAddress()->getHost();`
	`84`	`+ $this->info['primary_ip'] = $host;`
`84`	`85`
`85`	`86`	`if (str_contains($host, ':')) {`
`86`	`87`	`$host = '['.$host.']';`
`87`	`88`	`}`
`88`	`89`
`89`		`- $this->info['primary_ip'] = $host;`
`90`	`90`	`$this->info['primary_port'] = $stream->getRemoteAddress()->getPort();`
`91`	`91`	`$this->info['pretransfer_time'] = microtime(true) - $this->info['start_time'];`
`92`	`92`	`$this->info['debug'] .= \sprintf("* Connected to %s (%s) port %d\n", $request->getUri()->getHost(), $host, $this->info['primary_port']);`
Original file line number	Diff line number	Diff line change
`@@ -32,19 +32,31 @@ public function __construct(`
`32`	`32`
`33`	`33`	`public function resolve(string $name, ?int $typeRestriction = null): Promise`
`34`	`34`	`{`
`35`		`- if (!isset($this->dnsMap[$name]) \|\| !\in_array($typeRestriction, [Record::A, null], true)) {`
	`35`	`+ $recordType = Record::A;`
	`36`	`+ $ip = $this->dnsMap[$name] ?? null;`
	`37`	`+`
	`38`	`+ if (null !== $ip && str_contains($ip, ':')) {`
	`39`	`+ $recordType = Record::AAAA;`
	`40`	`+ }`
	`41`	`+ if (null === $ip \|\| $recordType !== ($typeRestriction ?? $recordType)) {`
`36`	`42`	`return Dns\resolver()->resolve($name, $typeRestriction);`
`37`	`43`	`}`
`38`	`44`
`39`		`- return new Success([new Record($this->dnsMap[$name], Record::A, null)]);`
	`45`	`+ return new Success([new Record($ip, $recordType, null)]);`
`40`	`46`	`}`
`41`	`47`
`42`	`48`	`public function query(string $name, int $type): Promise`
`43`	`49`	`{`
`44`		`- if (!isset($this->dnsMap[$name]) \|\| Record::A !== $type) {`
	`50`	`+ $recordType = Record::A;`
	`51`	`+ $ip = $this->dnsMap[$name] ?? null;`
	`52`	`+`
	`53`	`+ if (null !== $ip && str_contains($ip, ':')) {`
	`54`	`+ $recordType = Record::AAAA;`
	`55`	`+ }`
	`56`	`+ if (null === $ip \|\| $recordType !== $type) {`
`45`	`57`	`return Dns\resolver()->query($name, $type);`
`46`	`58`	`}`
`47`	`59`
`48`		`- return new Success([new Record($this->dnsMap[$name], Record::A, null)]);`
	`60`	`+ return new Success([new Record($ip, $recordType, null)]);`
`49`	`61`	`}`
`50`	`62`	`}`