[HttpClient] fix binding to network interfaces

nicolas-grekas · nicolas-grekas · commit 7694245066b7 · 2020-11-28T14:22:13.000+01:00
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -269,11 +269,11 @@ public function request(string $method, string $url, array $options = []): Respo
         if ($options['bindto']) {
             if (file_exists($options['bindto'])) {
                 $curlopts[\CURLOPT_UNIX_SOCKET_PATH] = $options['bindto'];
-            } elseif (preg_match('/^(.*):(\d+)$/', $options['bindto'], $matches)) {
+            } elseif (0 === strpos($options['bindto'], 'if!') || !preg_match('/^(.*):(\d+)$/', $options['bindto'], $matches)) {
+                $curlopts[\CURLOPT_INTERFACE] = $options['bindto'];
+            } else {
                 $curlopts[\CURLOPT_INTERFACE] = $matches[1];
                 $curlopts[\CURLOPT_LOCALPORT] = $matches[2];
-            } else {
-                $curlopts[\CURLOPT_INTERFACE] = $options['bindto'];
             }
         }
 
diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php
@@ -67,8 +67,16 @@ public function request(string $method, string $url, array $options = []): Respo
     {
         [$url, $options] = self::prepareRequest($method, $url, $options, $this->defaultOptions);
 
-        if ($options['bindto'] && file_exists($options['bindto'])) {
-            throw new TransportException(__CLASS__.' cannot bind to local Unix sockets, use e.g. CurlHttpClient instead.');
+        if ($options['bindto']) {
+            if (file_exists($options['bindto'])) {
+                throw new TransportException(__CLASS__.' cannot bind to local Unix sockets, use e.g. CurlHttpClient instead.');
+            }
+            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);
+            }
         }
 
         $options['body'] = self::getBodyAsString($options['body']);

Original file line number	Diff line number	Diff line change
`@@ -269,11 +269,11 @@ public function request(string $method, string $url, array $options = []): Respo`
`269`	`269`	`if ($options['bindto']) {`
`270`	`270`	`if (file_exists($options['bindto'])) {`
`271`	`271`	`$curlopts[\CURLOPT_UNIX_SOCKET_PATH] = $options['bindto'];`
`272`		`- } elseif (preg_match('/^(.*):(\d+)$/', $options['bindto'], $matches)) {`
	`272`	`+ } elseif (0 === strpos($options['bindto'], 'if!') \|\| !preg_match('/^(.*):(\d+)$/', $options['bindto'], $matches)) {`
	`273`	`+ $curlopts[\CURLOPT_INTERFACE] = $options['bindto'];`
	`274`	`+ } else {`
`273`	`275`	`$curlopts[\CURLOPT_INTERFACE] = $matches[1];`
`274`	`276`	`$curlopts[\CURLOPT_LOCALPORT] = $matches[2];`
`275`		`- } else {`
`276`		`- $curlopts[\CURLOPT_INTERFACE] = $options['bindto'];`
`277`	`277`	`}`
`278`	`278`	`}`
`279`	`279`