bug symfony#59320 [HttpClient] fix amphp http client v5 unix socket (praswicaksono)

This PR was squashed before being merged into the 7.2 branch.

Discussion
----------

[HttpClient] fix amphp http client v5 unix socket

| Q             | A
| ------------- | ---
| Branch?       | 7.2
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Issues        | -
| License       | MIT

Fix unix socket connection when using `amphp/http-client` v5

`@nicolas`-grekas

Commits
-------

a32ebfa [HttpClient] fix amphp http client v5 unix socket

Author: nicolas-grekas

src/Symfony/Component/HttpClient/Internal/AmpClientStateV5.php

@@ -28,6 +28,7 @@
 use Amp\Socket\ClientTlsContext;
 use Amp\Socket\ConnectContext;
 use Amp\Socket\DnsSocketConnector;
+use Amp\Socket\InternetAddress;
 use Amp\Socket\Socket;
 use Amp\Socket\SocketAddress;
 use Amp\Socket\SocketConnector;
@@ -160,7 +161,7 @@ public function connect(SocketAddress|string $uri, ?ConnectContext $context = nu
 
         if ($options['proxy']) {
             $proxyUrl = parse_url($options['proxy']['url']);
-            $proxySocket = new SocketAddress($proxyUrl['host'], $proxyUrl['port']);
+            $proxySocket = new InternetAddress($proxyUrl['host'], $proxyUrl['port']);
             $proxyHeaders = $options['proxy']['auth'] ? ['Proxy-Authorization' => $options['proxy']['auth']] : [];
 
             if ('ssl' === $proxyUrl['scheme']) {

src/Symfony/Component/HttpClient/Internal/AmpListenerV5.php

@@ -18,6 +18,7 @@
 use Amp\Http\Client\NetworkInterceptor;
 use Amp\Http\Client\Request;
 use Amp\Http\Client\Response;
+use Amp\Socket\InternetAddress;
 use Symfony\Component\HttpClient\Exception\TransportException;
 
 /**
@@ -66,14 +67,18 @@ public function connectionAcquired(Request $request, Connection $connection, int
 
     public function requestHeaderStart(Request $request, Stream $stream): void
     {
-        $host = $stream->getRemoteAddress()->getAddress();
+        $host = $stream->getRemoteAddress()->toString();
+        if ($stream->getRemoteAddress() instanceof InternetAddress) {
+            $host = $stream->getRemoteAddress()->getAddress();
+            $this->info['primary_port'] = $stream->getRemoteAddress()->getPort();
+        }
+
         $this->info['primary_ip'] = $host;
 
         if (str_contains($host, ':')) {
             $host = '['.$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']);
 

src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php

@@ -700,4 +700,24 @@ public function testPostToGetRedirect(int $status)
         $this->assertSame('GET', $body['REQUEST_METHOD']);
         $this->assertSame('/', $body['REQUEST_URI']);
     }
+
+    public function testUnixSocket()
+    {
+        if (!file_exists('/var/run/docker.sock')) {
+            $this->markTestSkipped('Docker socket not found.');
+        }
+
+        $client = $this->getHttpClient(__FUNCTION__)
+            ->withOptions([
+                'base_uri' => 'http://docker',
+                'bindto' => '/run/docker.sock',
+            ]);
+
+        $response = $client->request('GET', '/info');
+
+        $this->assertSame(200, $response->getStatusCode());
+
+        $info = $response->getInfo();
+        $this->assertSame('/run/docker.sock', $info['primary_ip']);
+    }
 }

src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php

@@ -505,6 +505,11 @@ public function testHttp2PushVulcainWithUnusedResponse()
         $this->markTestSkipped('MockHttpClient doesn\'t support HTTP/2 PUSH.');
     }
 
+    public function testUnixSocket()
+    {
+        $this->markTestSkipped('MockHttpClient doesn\'t support binding to unix sockets.');
+    }
+
     public function testChangeResponseFactory()
     {
         /* @var MockHttpClient $client */

src/Symfony/Component/HttpClient/Tests/NativeHttpClientTest.php

@@ -48,4 +48,9 @@ public function testHttp2PushVulcainWithUnusedResponse()
     {
         $this->markTestSkipped('NativeHttpClient doesn\'t support HTTP/2.');
     }
+
+    public function testUnixSocket()
+    {
+        $this->markTestSkipped('NativeHttpClient doesn\'t support binding to unix sockets.');
+    }
 }