fix: Pass original hostname to ssl configuration before IP resolution

neo4j-php · Jul 31, 2024 · 7681d10 · 7681d10
1 parent 899e753
commit 7681d10
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git a/src/Bolt/ConnectionPool.php b/src/Bolt/ConnectionPool.php
@@ -50,6 +50,7 @@ public static function create(UriInterface $uri, AuthenticateInterface $auth, Dr
             $semaphore,
             BoltFactory::create(),
             new ConnectionRequestData(
+                $uri->getHost(),
                 $uri,
                 $auth,
                 $conf->getUserAgent(),

diff --git a/src/BoltFactory.php b/src/BoltFactory.php
@@ -50,7 +50,7 @@ public static function create(): self
 
     public function createConnection(ConnectionRequestData $data, SessionConfiguration $sessionConfig): BoltConnection
     {
-        [$sslLevel, $sslConfig] = $this->sslConfigurationFactory->create($data->getUri(), $data->getSslConfig());
+        [$sslLevel, $sslConfig] = $this->sslConfigurationFactory->create($data->getUri()->withHost($data->getHostname()), $data->getSslConfig());
 
         $uriConfig = new UriConfiguration(
             $data->getUri()->getHost(),

diff --git a/src/Databags/ConnectionRequestData.php b/src/Databags/ConnectionRequestData.php
@@ -22,12 +22,18 @@
 final class ConnectionRequestData
 {
     public function __construct(
+        private readonly string $hostname,
         private readonly UriInterface $uri,
         private readonly AuthenticateInterface $auth,
         private readonly string $userAgent,
         private readonly SslConfiguration $config
     ) {}
 
+    public function getHostname(): string
+    {
+        return $this->hostname;
+    }
+
     public function getUri(): UriInterface
     {
         return $this->uri;

diff --git a/src/Neo4j/Neo4jConnectionPool.php b/src/Neo4j/Neo4jConnectionPool.php
@@ -82,6 +82,7 @@ public static function create(UriInterface $uri, AuthenticateInterface $auth, Dr
             $semaphore,
             BoltFactory::create(),
             new ConnectionRequestData(
+                $uri->getHost(),
                 $uri,
                 $auth,
                 $conf->getUserAgent(),
@@ -92,9 +93,10 @@ public static function create(UriInterface $uri, AuthenticateInterface $auth, Dr
         );
     }
 
-    public function createOrGetPool(UriInterface $uri): ConnectionPool
+    public function createOrGetPool(string $hostname, UriInterface $uri): ConnectionPool
     {
         $data = new ConnectionRequestData(
+            $hostname,
             $uri,
             $this->data->getAuth(),
             $this->data->getUserAgent(),
@@ -130,7 +132,7 @@ public function acquire(SessionConfiguration $config): Generator
             foreach ($addresses as $address) {
                 $triedAddresses[] = $address;
 
-                $pool = $this->createOrGetPool($this->data->getUri()->withHost($address));
+                $pool = $this->createOrGetPool($this->data->getUri()->getHost(), $this->data->getUri()->withHost($address));
                 try {
                     /** @var BoltConnection $connection */
                     $connection = GeneratorHelper::getReturnFromGenerator($pool->acquire($config));
@@ -158,7 +160,7 @@ public function acquire(SessionConfiguration $config): Generator
             $server = $server->withScheme($this->data->getUri()->getScheme());
         }
 
-        return $this->createOrGetPool($server)->acquire($config);
+        return $this->createOrGetPool($this->data->getUri()->getHost(), $server)->acquire($config);
     }
 
     /**
@@ -200,7 +202,7 @@ private function routingTable(BoltConnection $connection, SessionConfiguration $
 
     public function release(ConnectionInterface $connection): void
     {
-        $this->createOrGetPool($connection->getServerAddress())->release($connection);
+        $this->createOrGetPool($connection->getServerAddress()->getHost(), $connection->getServerAddress())->release($connection);
     }
 
     private function createKey(ConnectionRequestData $data, ?SessionConfiguration $config = null): string

diff --git a/tests/Integration/BoltResultIntegrationTest.php b/tests/Integration/BoltResultIntegrationTest.php
@@ -40,7 +40,7 @@ public function testIterationLong(): void
             new SslConfigurationFactory()
         );
         $connection = $factory->createConnection(
-            new ConnectionRequestData($this->getUri(), Authenticate::fromUrl($this->getUri()), 'a/b', new SslConfiguration(SslMode::FROM_URL(), false)),
+            new ConnectionRequestData($this->getUri()->getHost(), $this->getUri(), Authenticate::fromUrl($this->getUri()), 'a/b', new SslConfiguration(SslMode::FROM_URL(), false)),
             SessionConfiguration::default()
         );
 

diff --git a/tests/Unit/BoltConnectionPoolTest.php b/tests/Unit/BoltConnectionPoolTest.php
@@ -157,6 +157,7 @@ private function setupPool(Generator $semaphoreGenerator): void
 
         $this->pool = new ConnectionPool(
             $this->semaphore, $this->factory, new ConnectionRequestData(
+                '',
                 Uri::create(''),
                 Authenticate::disabled(),
                 '',

diff --git a/tests/Unit/BoltFactoryTest.php b/tests/Unit/BoltFactoryTest.php
@@ -62,7 +62,7 @@ protected function setUp(): void
     public function testCreateBasic(): void
     {
         $connection = $this->factory->createConnection(
-            new ConnectionRequestData(Uri::create(''), Authenticate::disabled(), '', SslConfiguration::default()),
+            new ConnectionRequestData('', Uri::create(''), Authenticate::disabled(), '', SslConfiguration::default()),
             SessionConfiguration::default()
         );