[HttpClient] fix proxied redirects in curl client

matthi4s · matthi4s · commit ca2d0f67902a · 2023-04-12T16:18:42.000+02:00
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -436,12 +436,6 @@ private static function createRedirectResolver(array $options, string $host): \C
             $url = self::parseUrl(curl_getinfo($ch, \CURLINFO_EFFECTIVE_URL));
             $url = self::resolveUrl($location, $url);
 
-            curl_setopt($ch, \CURLOPT_PROXY, $options['proxy']
-                ?? ('https:' === $url['scheme'] ? $_SERVER['https_proxy'] ?? $_SERVER['HTTPS_PROXY'] ?? null : null)
-                // Ignore HTTP_PROXY except on the CLI to work around httpoxy set of vulnerabilities
-                ?? $_SERVER['http_proxy'] ?? (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? $_SERVER['HTTP_PROXY'] ?? null : null) ?? $_SERVER['all_proxy'] ?? $_SERVER['ALL_PROXY'] ?? null
-            );
-
             return implode('', $url);
         };
     }
diff --git a/src/Symfony/Contracts/HttpClient/Test/Fixtures/web/index.php b/src/Symfony/Contracts/HttpClient/Test/Fixtures/web/index.php
@@ -86,6 +86,12 @@
         header('Location: //?foo=bar', true, 301);
         break;
 
+    case '/301/proxy':
+    case 'http://localhost:8057/301/proxy':
+    case 'http://127.0.0.1:8057/301/proxy':
+        header('Location: http://localhost:8057/', true, 301);
+        break;
+
     case '/302':
         if (!isset($vars['HTTP_AUTHORIZATION'])) {
             header('Location: http://localhost:8057/', true, 302);
diff --git a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php
@@ -969,6 +969,14 @@ public function testProxy()
         } finally {
             unset($_SERVER['http_proxy']);
         }
+
+        $response = $client->request('GET', 'http://localhost:8057/301/proxy', [
+            'proxy' => 'http://localhost:8057',
+        ]);
+
+        $body = $response->toArray();
+        $this->assertSame('localhost:8057', $body['HTTP_HOST']);
+        $this->assertMatchesRegularExpression('#^http://(localhost|127\.0\.0\.1):8057/$#', $body['REQUEST_URI']);
     }
 
     public function testNoProxy()

Original file line number	Diff line number	Diff line change
`@@ -969,6 +969,14 @@ public function testProxy()`
`969`	`969`	`} finally {`
`970`	`970`	`unset($_SERVER['http_proxy']);`
`971`	`971`	`}`
	`972`	`+`
	`973`	`+ $response = $client->request('GET', 'http://localhost:8057/301/proxy', [`
	`974`	`+ 'proxy' => 'http://localhost:8057',`
	`975`	`+ ]);`
	`976`	`+`
	`977`	`+ $body = $response->toArray();`
	`978`	`+ $this->assertSame('localhost:8057', $body['HTTP_HOST']);`
	`979`	`+ $this->assertMatchesRegularExpression('#^http://(localhost\|127\.0\.0\.1):8057/$#', $body['REQUEST_URI']);`
`972`	`980`	`}`
`973`	`981`
`974`	`982`	`public function testNoProxy()`