bug #39211 [HttpClient] fix binding to network interfaces (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 3e9f770e25eb · 2020-11-28T14:31:15.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpClient] fix binding to network interfaces | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #38979 | License | MIT | Doc PR | - Fixes support for binding to local interfaces by adding support for [curl's `if!` prefix](https://curl.se/libcurl/c/CURLOPT_INTERFACE.html). Commits ------- faa1fd3 [HttpClient] fix binding to network interfaces
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -269,7 +269,7 @@ 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] = $matches[1];
                 $curlopts[\CURLOPT_LOCALPORT] = $matches[2];
             } else {
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']);
