[HttpClient] fix binding to network interfaces

nicolas-grekas · nicolas-grekas · commit 02d16324a5df · 2020-11-28T14:32:28.000+01:00
diff --git a/src/Symfony/Component/HttpClient/AmpHttpClient.php b/src/Symfony/Component/HttpClient/AmpHttpClient.php
@@ -82,6 +82,15 @@ public function request(string $method, string $url, array $options = []): Respo
             throw new \LogicException('You cannot use the "proxy" option as the "amphp/http-tunnel" package is not installed. Try running "composer require amphp/http-tunnel".');
         }
 
+        if ($options['bindto']) {
+            if (0 === strpos($options['bindto'], 'if!')) {
+                throw new TransportException(__CLASS__.' cannot bind to network interfaces, use e.g. CurlHttpClient instead.');
+            }
+            if (0 === strpos($options['bindto'], 'host!')) {
+                $options['bindto'] = substr($options['bindto'], 5);
+            }
+        }
+
         if ('' !== $options['body'] && 'POST' === $method && !isset($options['normalized_headers']['content-type'])) {
             $options['headers'][] = 'Content-Type: application/x-www-form-urlencoded';
         }
@@ -141,7 +150,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa
         if ($responses instanceof AmpResponse) {
             $responses = [$responses];
         } elseif (!is_iterable($responses)) {
-            throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of AmpResponse objects, %s given.', __METHOD__, get_debug_type($responses)));
+            throw new \TypeError(sprintf('"%s()" expects parameter 1 to be an iterable of AmpResponse objects, "%s" given.', __METHOD__, get_debug_type($responses)));
         }
 
         return new ResponseStream(AmpResponse::stream($responses, $timeout));
diff --git a/src/Symfony/Component/HttpClient/Internal/AmpClientState.php b/src/Symfony/Component/HttpClient/Internal/AmpClientState.php
@@ -119,7 +119,7 @@ public function request(array $options, Request $request, CancellationToken $can
     private function getClient(array $options): array
     {
         $options = [
-            'bindto' => $options['bindto'] ?: '0',
+            'bindto' => $options['bindto'] ?: '0:0',
             'verify_peer' => $options['verify_peer'],
             'capath' => $options['capath'],
             'cafile' => $options['cafile'],

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public function request(array $options, Request $request, CancellationToken $can`
`119`	`119`	`private function getClient(array $options): array`
`120`	`120`	`{`
`121`	`121`	`$options = [`
`122`		`- 'bindto' => $options['bindto'] ?: '0',`
	`122`	`+ 'bindto' => $options['bindto'] ?: '0:0',`
`123`	`123`	`'verify_peer' => $options['verify_peer'],`
`124`	`124`	`'capath' => $options['capath'],`
`125`	`125`	`'cafile' => $options['cafile'],`