Fix authentication propagation bug when working in clusters

Author: transistive

src/Bolt/BoltConnectionPool.php

@@ -18,6 +18,7 @@
 use function explode;
 use const FILTER_VALIDATE_IP;
 use function filter_var;
+use Laudis\Neo4j\Contracts\AuthenticateInterface;
 use Laudis\Neo4j\Contracts\ConnectionPoolInterface;
 use Laudis\Neo4j\Enum\AccessMode;
 use Psr\Http\Message\UriInterface;
@@ -31,7 +32,7 @@ final class BoltConnectionPool implements ConnectionPoolInterface
     /**
      * @throws Exception
      */
-    public function acquire(UriInterface $uri, AccessMode $mode): StreamSocket
+    public function acquire(UriInterface $uri, AccessMode $mode, AuthenticateInterface $authenticate): StreamSocket
     {
         $host = $uri->getHost();
         $socket = new StreamSocket($host, $uri->getPort() ?? 7687);

src/Bolt/Session.php

@@ -110,7 +110,7 @@ public function transaction(callable $tsxHandler, ?TransactionConfiguration $con
     public function beginTransaction(?iterable $statements = null, ?TransactionConfiguration $config = null): UnmanagedTransactionInterface
     {
         try {
-            $bolt = new Bolt($this->pool->acquire($this->uri, $this->config->getAccessMode()));
+            $bolt = new Bolt($this->pool->acquire($this->uri, $this->config->getAccessMode(), $this->auth));
             $this->auth->authenticateBolt($bolt, $this->uri, $this->userAgent);
 
             $begin = $bolt->begin(['db' => $this->config->getDatabase()]);

src/Contracts/ConnectionPoolInterface.php

@@ -24,5 +24,5 @@ interface ConnectionPoolInterface
     /**
      * @return T
      */
-    public function acquire(UriInterface $uri, AccessMode $mode);
+    public function acquire(UriInterface $uri, AccessMode $mode, AuthenticateInterface $authenticate);
 }

src/Http/HttpConnectionPool.php

@@ -13,6 +13,7 @@
 
 namespace Laudis\Neo4j\Http;
 
+use Laudis\Neo4j\Contracts\AuthenticateInterface;
 use Laudis\Neo4j\Contracts\ConnectionPoolInterface;
 use Laudis\Neo4j\Enum\AccessMode;
 use Psr\Http\Client\ClientInterface;
@@ -30,7 +31,7 @@ public function __construct(ClientInterface $client)
         $this->client = $client;
     }
 
-    public function acquire(UriInterface $uri, AccessMode $mode): ClientInterface
+    public function acquire(UriInterface $uri, AccessMode $mode, AuthenticateInterface $authenticate): ClientInterface
     {
         return $this->client;
     }

src/Http/HttpDriver.php

@@ -144,7 +144,8 @@ public function createSession(?SessionConfiguration $config = null): SessionInte
             $config,
             $this->formatter,
             $factory,
-            $this->transactionUrl
+            $this->transactionUrl,
+            $this->auth
         );
     }
 

src/Http/HttpSession.php

@@ -15,6 +15,7 @@
 
 use JsonException;
 use Laudis\Neo4j\Common\TransactionHelper;
+use Laudis\Neo4j\Contracts\AuthenticateInterface;
 use Laudis\Neo4j\Contracts\FormatterInterface;
 use Laudis\Neo4j\Contracts\SessionInterface;
 use Laudis\Neo4j\Contracts\UnmanagedTransactionInterface;
@@ -44,6 +45,7 @@ final class HttpSession implements SessionInterface
     private FormatterInterface $formatter;
     private RequestFactory $requestFactory;
     private string $uri;
+    private AuthenticateInterface $auth;
 
     /**
      * @param FormatterInterface<T> $formatter
@@ -54,14 +56,16 @@ public function __construct(
         SessionConfiguration $config,
         FormatterInterface $formatter,
         RequestFactory $requestFactory,
-        string $uri
+        string $uri,
+        AuthenticateInterface $auth
     ) {
         $this->streamFactory = $factory;
         $this->config = $config;
         $this->pool = $manager;
         $this->formatter = $formatter;
         $this->requestFactory = $requestFactory;
         $this->uri = $uri;
+        $this->auth = $auth;
     }
 
     /**
@@ -70,7 +74,7 @@ public function __construct(
     public function runStatements(iterable $statements, ?TransactionConfiguration $config = null): CypherList
     {
         $request = $this->requestFactory->createRequest('POST', $this->uri);
-        $client = $this->pool->acquire($request->getUri(), $this->config->getAccessMode());
+        $client = $this->pool->acquire($request->getUri(), $this->config->getAccessMode(), $this->auth);
         $content = HttpHelper::statementsToString($this->formatter, $statements);
         $request = $this->instantCommitRequest($request)->withBody($this->streamFactory->createStream($content));
 
@@ -135,7 +139,7 @@ public function beginTransaction(?iterable $statements = null, ?TransactionConfi
     {
         $request = $this->requestFactory->createRequest('POST', $this->uri);
         $request->getBody()->write(HttpHelper::statementsToString($this->formatter, $statements ?? []));
-        $client = $this->pool->acquire($request->getUri(), $this->config->getAccessMode());
+        $client = $this->pool->acquire($request->getUri(), $this->config->getAccessMode(), $this->auth);
         $response = $client->sendRequest($request);
 
         /** @var array{commit: string} $data */

src/Neo4j/Neo4jConnectionPool.php

@@ -20,6 +20,7 @@
 use function filter_var;
 use Laudis\Neo4j\Bolt\BoltDriver;
 use Laudis\Neo4j\Common\Uri;
+use Laudis\Neo4j\Contracts\AuthenticateInterface;
 use Laudis\Neo4j\Contracts\ConnectionPoolInterface;
 use Laudis\Neo4j\Enum\AccessMode;
 use Laudis\Neo4j\Enum\RoutingRoles;
@@ -51,12 +52,12 @@ public function __construct(ConnectionPoolInterface $pool)
     /**
      * @throws Exception
      */
-    public function acquire(UriInterface $uri, AccessMode $mode): StreamSocket
+    public function acquire(UriInterface $uri, AccessMode $mode, AuthenticateInterface $authenticate): StreamSocket
     {
-        $table = $this->routingTable($uri);
+        $table = $this->routingTable($uri, $authenticate);
         $server = $this->getNextServer($table, $mode);
 
-        $socket = $this->pool->acquire(Uri::create($server), $mode);
+        $socket = $this->pool->acquire(Uri::create($server), $mode, $authenticate);
 
         $scheme = $uri->getScheme();
         $explosion = explode('+', $scheme, 2);
@@ -107,10 +108,10 @@ private function getNextServer(RoutingTable $table, AccessMode $mode): string
      *
      * @throws Exception
      */
-    private function routingTable(UriInterface $uri): RoutingTable
+    private function routingTable(UriInterface $uri, AuthenticateInterface $authenticate): RoutingTable
     {
         if ($this->table === null || $this->table->getTtl() < time()) {
-            $session = BoltDriver::create($uri)->createSession();
+            $session = BoltDriver::create($uri, null, $authenticate)->createSession();
             $row = $session->run(
                 'CALL dbms.components() yield versions UNWIND versions as version RETURN version'
             )->first();