neo4j · injectives · Jan 25, 2022 · Jan 21, 2022
diff --git a/driver/clirr-ignored-differences.xml b/driver/clirr-ignored-differences.xml
@@ -43,4 +43,10 @@
         <method>org.reactivestreams.Publisher close()</method>
     </difference>
 
+    <difference>
+        <className>org/neo4j/driver/summary/ServerInfo</className>
+        <differenceType>7002</differenceType>
+        <method>java.lang.String version()</method>
+    </difference>
+
 </differences>
diff --git a/driver/src/main/java/org/neo4j/driver/internal/ImpersonationUtil.java b/driver/src/main/java/org/neo4j/driver/internal/ImpersonationUtil.java
@@ -21,7 +21,6 @@
 import org.neo4j.driver.exceptions.ClientException;
 import org.neo4j.driver.internal.messaging.v44.BoltProtocolV44;
 import org.neo4j.driver.internal.spi.Connection;
-import org.neo4j.driver.internal.util.ServerVersion;
 
 public class ImpersonationUtil
 {
@@ -40,7 +39,6 @@ public static Connection ensureImpersonationSupport( Connection connection, Stri
 
     private static boolean supportsImpersonation( Connection connection )
     {
-        return connection.serverVersion().greaterThanOrEqual( ServerVersion.v4_4_0 ) &&
-               connection.protocol().version().compareTo( BoltProtocolV44.VERSION ) >= 0;
+        return connection.protocol().version().compareTo( BoltProtocolV44.VERSION ) >= 0;
     }
 }
diff --git a/driver/src/main/java/org/neo4j/driver/internal/async/NetworkConnection.java b/driver/src/main/java/org/neo4j/driver/internal/async/NetworkConnection.java
@@ -43,7 +43,6 @@
 import org.neo4j.driver.internal.spi.Connection;
 import org.neo4j.driver.internal.spi.ResponseHandler;
 import org.neo4j.driver.internal.util.Clock;
-import org.neo4j.driver.internal.util.ServerVersion;
 
 import static java.util.Collections.emptyMap;
 import static org.neo4j.driver.internal.async.connection.ChannelAttributes.poolId;
@@ -61,7 +60,6 @@ public class NetworkConnection implements Connection
     private final InboundMessageDispatcher messageDispatcher;
     private final String serverAgent;
     private final BoltServerAddress serverAddress;
-    private final ServerVersion serverVersion;
     private final BoltProtocol protocol;
     private final ExtendedChannelPool channelPool;
     private final CompletableFuture<Void> releaseFuture;
@@ -81,7 +79,6 @@ public NetworkConnection( Channel channel, ExtendedChannelPool channelPool, Cloc
         this.messageDispatcher = ChannelAttributes.messageDispatcher( channel );
         this.serverAgent = ChannelAttributes.serverAgent( channel );
         this.serverAddress = ChannelAttributes.serverAddress( channel );
-        this.serverVersion = ChannelAttributes.serverVersion( channel );
         this.protocol = BoltProtocol.forChannel( channel );
         this.channelPool = channelPool;
         this.releaseFuture = new CompletableFuture<>();
@@ -213,12 +210,6 @@ public BoltServerAddress serverAddress()
         return serverAddress;
     }
 
-    @Override
-    public ServerVersion serverVersion()
-    {
-        return serverVersion;
-    }
-
     @Override
     public BoltProtocol protocol()
     {

diff --git a/driver/src/main/java/org/neo4j/driver/internal/async/connection/ChannelAttributes.java b/driver/src/main/java/org/neo4j/driver/internal/async/connection/ChannelAttributes.java
@@ -26,7 +26,6 @@
 import org.neo4j.driver.internal.BoltServerAddress;
 import org.neo4j.driver.internal.async.inbound.InboundMessageDispatcher;
 import org.neo4j.driver.internal.messaging.BoltProtocolVersion;
-import org.neo4j.driver.internal.util.ServerVersion;
 
 import static io.netty.util.AttributeKey.newInstance;
 
@@ -37,7 +36,6 @@ public final class ChannelAttributes
     private static final AttributeKey<BoltProtocolVersion> PROTOCOL_VERSION = newInstance( "protocolVersion" );
     private static final AttributeKey<String> SERVER_AGENT = newInstance( "serverAgent" );
     private static final AttributeKey<BoltServerAddress> ADDRESS = newInstance( "serverAddress" );
-    private static final AttributeKey<ServerVersion> SERVER_VERSION = newInstance( "serverVersion" );
     private static final AttributeKey<Long> CREATION_TIMESTAMP = newInstance( "creationTimestamp" );
     private static final AttributeKey<Long> LAST_USED_TIMESTAMP = newInstance( "lastUsedTimestamp" );
     private static final AttributeKey<InboundMessageDispatcher> MESSAGE_DISPATCHER = newInstance( "messageDispatcher" );
@@ -101,16 +99,6 @@ public static void setServerAddress( Channel channel, BoltServerAddress address
         setOnce( channel, ADDRESS, address );
     }
 
-    public static ServerVersion serverVersion( Channel channel )
-    {
-        return get( channel, SERVER_VERSION );
-    }
-
-    public static void setServerVersion( Channel channel, ServerVersion version )
-    {
-        setOnce( channel, SERVER_VERSION, version );
-    }
-
     public static long creationTimestamp( Channel channel )
     {
         return get( channel, CREATION_TIMESTAMP );

diff --git a/driver/src/main/java/org/neo4j/driver/internal/async/connection/DirectConnection.java b/driver/src/main/java/org/neo4j/driver/internal/async/connection/DirectConnection.java
@@ -28,7 +28,6 @@
 import org.neo4j.driver.internal.messaging.Message;
 import org.neo4j.driver.internal.spi.Connection;
 import org.neo4j.driver.internal.spi.ResponseHandler;
-import org.neo4j.driver.internal.util.ServerVersion;
 
 /**
  * This is a connection used by {@link DirectConnectionProvider} to connect to a remote database.
@@ -125,12 +124,6 @@ public BoltServerAddress serverAddress()
         return delegate.serverAddress();
     }
 
-    @Override
-    public ServerVersion serverVersion()
-    {
-        return delegate.serverVersion();
-    }
-
     @Override
     public BoltProtocol protocol()
     {

diff --git a/driver/src/main/java/org/neo4j/driver/internal/async/connection/RoutingConnection.java b/driver/src/main/java/org/neo4j/driver/internal/async/connection/RoutingConnection.java
@@ -29,7 +29,6 @@
 import org.neo4j.driver.internal.messaging.Message;
 import org.neo4j.driver.internal.spi.Connection;
 import org.neo4j.driver.internal.spi.ResponseHandler;
-import org.neo4j.driver.internal.util.ServerVersion;
 
 /**
  * A connection used by the routing driver.
@@ -123,12 +122,6 @@ public BoltServerAddress serverAddress()
         return delegate.serverAddress();
     }
 
-    @Override
-    public ServerVersion serverVersion()
-    {
-        return delegate.serverVersion();
-    }
-
     @Override
     public BoltProtocol protocol()
     {

diff --git a/...src/main/java/org/neo4j/driver/internal/cluster/MultiDatabasesRoutingProcedureRunner.java b/...src/main/java/org/neo4j/driver/internal/cluster/MultiDatabasesRoutingProcedureRunner.java
@@ -28,8 +28,8 @@
 import org.neo4j.driver.internal.DatabaseName;
 import org.neo4j.driver.internal.ReadOnlyBookmarkHolder;
 import org.neo4j.driver.internal.async.connection.DirectConnection;
+import org.neo4j.driver.internal.messaging.BoltProtocolVersion;
 import org.neo4j.driver.internal.spi.Connection;
-import org.neo4j.driver.internal.util.ServerVersion;
 
 import static org.neo4j.driver.Values.value;
 import static org.neo4j.driver.internal.DatabaseNameUtil.systemDatabase;
@@ -56,7 +56,7 @@ BookmarkHolder bookmarkHolder( Bookmark bookmark )
     }
 
     @Override
-    Query procedureQuery(ServerVersion serverVersion, DatabaseName databaseName )
+    Query procedureQuery( BoltProtocolVersion protocolVersion, DatabaseName databaseName )
     {
         HashMap<String,Value> map = new HashMap<>();
         map.put( ROUTING_CONTEXT, value( context.toMap() ) );

diff --git a/...src/main/java/org/neo4j/driver/internal/cluster/SingleDatabaseRoutingProcedureRunner.java b/...src/main/java/org/neo4j/driver/internal/cluster/SingleDatabaseRoutingProcedureRunner.java
@@ -33,9 +33,9 @@
 import org.neo4j.driver.internal.BookmarkHolder;
 import org.neo4j.driver.internal.DatabaseName;
 import org.neo4j.driver.internal.async.connection.DirectConnection;
+import org.neo4j.driver.internal.messaging.BoltProtocolVersion;
 import org.neo4j.driver.internal.spi.Connection;
 import org.neo4j.driver.internal.util.Futures;
-import org.neo4j.driver.internal.util.ServerVersion;
 
 import static org.neo4j.driver.Values.parameters;
 import static org.neo4j.driver.internal.DatabaseNameUtil.defaultDatabase;
@@ -61,7 +61,7 @@ public SingleDatabaseRoutingProcedureRunner( RoutingContext context )
     public CompletionStage<RoutingProcedureResponse> run( Connection connection, DatabaseName databaseName, Bookmark bookmark, String impersonatedUser )
     {
         DirectConnection delegate = connection( connection );
-        Query procedure = procedureQuery( connection.serverVersion(), databaseName );
+        Query procedure = procedureQuery( connection.protocol().version(), databaseName );
         BookmarkHolder bookmarkHolder = bookmarkHolder( bookmark );
         return runProcedure( delegate, procedure, bookmarkHolder )
                 .thenCompose( records -> releaseConnection( delegate, records ) )
@@ -73,13 +73,13 @@ DirectConnection connection( Connection connection )
         return new DirectConnection( connection, defaultDatabase(), AccessMode.WRITE, null );
     }
 
-    Query procedureQuery(ServerVersion serverVersion, DatabaseName databaseName )
+    Query procedureQuery( BoltProtocolVersion protocolVersion, DatabaseName databaseName )
     {
         if ( databaseName.databaseName().isPresent() )
         {
             throw new FatalDiscoveryException( String.format(
-                    "Refreshing routing table for multi-databases is not supported in server version lower than 4.0. " +
-                            "Current server version: %s. Database name: '%s'", serverVersion, databaseName.description() ) );
+                    "Refreshing routing table for multi-databases is not supported over Bolt protocol lower than 4.0. " +
+                    "Current protocol version: %s. Database name: '%s'", protocolVersion, databaseName.description() ) );
         }
         return new Query( GET_ROUTING_TABLE, parameters( ROUTING_CONTEXT, context.toMap() ) );
     }

diff --git a/driver/src/main/java/org/neo4j/driver/internal/handlers/HelloResponseHandler.java b/driver/src/main/java/org/neo4j/driver/internal/handlers/HelloResponseHandler.java
@@ -26,17 +26,12 @@
 import java.util.function.Supplier;
 
 import org.neo4j.driver.Value;
-import org.neo4j.driver.internal.messaging.BoltProtocolVersion;
-import org.neo4j.driver.internal.messaging.v3.BoltProtocolV3;
 import org.neo4j.driver.internal.spi.ResponseHandler;
 
 import static org.neo4j.driver.internal.async.connection.ChannelAttributes.setConnectionId;
 import static org.neo4j.driver.internal.async.connection.ChannelAttributes.setConnectionReadTimeout;
 import static org.neo4j.driver.internal.async.connection.ChannelAttributes.setServerAgent;
-import static org.neo4j.driver.internal.async.connection.ChannelAttributes.setServerVersion;
-import static org.neo4j.driver.internal.util.MetadataExtractor.extractNeo4jServerVersion;
 import static org.neo4j.driver.internal.util.MetadataExtractor.extractServer;
-import static org.neo4j.driver.internal.util.ServerVersion.fromBoltProtocolVersion;
 
 public class HelloResponseHandler implements ResponseHandler
 {
@@ -46,33 +41,20 @@ public class HelloResponseHandler implements ResponseHandler
 
     private final ChannelPromise connectionInitializedPromise;
     private final Channel channel;
-    private final BoltProtocolVersion protocolVersion;
 
-    public HelloResponseHandler( ChannelPromise connectionInitializedPromise, BoltProtocolVersion protocolVersion )
+    public HelloResponseHandler( ChannelPromise connectionInitializedPromise )
     {
         this.connectionInitializedPromise = connectionInitializedPromise;
         this.channel = connectionInitializedPromise.channel();
-        this.protocolVersion = protocolVersion;
     }
 
     @Override
     public void onSuccess( Map<String,Value> metadata )
     {
         try
         {
-            Value serverValue = extractServer( metadata );
-            setServerAgent( channel, serverValue.asString() );
-
-            // From Server V4 extracting server from metadata in the success message is unreliable
-            // so we fix the Server version against the Bolt Protocol version for Server V4 and above.
-            if ( BoltProtocolV3.VERSION.equals( protocolVersion ) )
-            {
-                setServerVersion( channel, extractNeo4jServerVersion( metadata ) );
-            }
-            else
-            {
-                setServerVersion( channel, fromBoltProtocolVersion( protocolVersion ) );
-            }
+            String serverAgent = extractServer( metadata ).asString();
+            setServerAgent( channel, serverAgent );
 
             String connectionId = extractConnectionId( metadata );
             setConnectionId( channel, connectionId );

diff --git a/driver/src/main/java/org/neo4j/driver/internal/handlers/InitResponseHandler.java b/driver/src/main/java/org/neo4j/driver/internal/handlers/InitResponseHandler.java
@@ -19,18 +19,15 @@
 package org.neo4j.driver.internal.handlers;
 
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelPipeline;
 import io.netty.channel.ChannelPromise;
 
 import java.util.Map;
 
-import org.neo4j.driver.internal.async.outbound.OutboundMessageHandler;
-import org.neo4j.driver.internal.spi.ResponseHandler;
-import org.neo4j.driver.internal.util.ServerVersion;
 import org.neo4j.driver.Value;
+import org.neo4j.driver.exceptions.UntrustedServerException;
+import org.neo4j.driver.internal.spi.ResponseHandler;
 
-import static org.neo4j.driver.internal.async.connection.ChannelAttributes.setServerVersion;
-import static org.neo4j.driver.internal.util.MetadataExtractor.extractNeo4jServerVersion;
+import static org.neo4j.driver.internal.util.MetadataExtractor.extractServer;
 
 public class InitResponseHandler implements ResponseHandler
 {
@@ -48,8 +45,13 @@ public void onSuccess( Map<String,Value> metadata )
     {
         try
         {
-            ServerVersion serverVersion = extractNeo4jServerVersion( metadata );
-            setServerVersion( channel, serverVersion );
+            String serverAgent = extractServer( metadata ).asString();
+
+            if ( !serverAgent.startsWith( "Neo4j/" ) )
+            {
+                throw new UntrustedServerException( "Server does not identify as a genuine Neo4j instance: '" + serverAgent + "'" );
+            }
+
             connectionInitializedPromise.setSuccess();
         }
         catch ( Throwable error )

diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/request/MultiDatabaseUtil.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/request/MultiDatabaseUtil.java
@@ -24,7 +24,6 @@
 import org.neo4j.driver.internal.messaging.v4.BoltProtocolV4;
 import org.neo4j.driver.internal.messaging.v43.BoltProtocolV43;
 import org.neo4j.driver.internal.spi.Connection;
-import org.neo4j.driver.internal.util.ServerVersion;
 
 public final class MultiDatabaseUtil
 {
@@ -39,8 +38,7 @@ public static void assertEmptyDatabaseName( DatabaseName databaseName, BoltProto
 
     public static boolean supportsMultiDatabase( Connection connection )
     {
-        return connection.serverVersion().greaterThanOrEqual( ServerVersion.v4_0_0 ) &&
-               connection.protocol().version().compareTo( BoltProtocolV4.VERSION ) >= 0;
+        return connection.protocol().version().compareTo( BoltProtocolV4.VERSION ) >= 0;
     }
 
     public static boolean supportsRouteMessage( Connection connection )

diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/v3/BoltProtocolV3.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/v3/BoltProtocolV3.java
@@ -91,7 +91,7 @@ public void initializeChannel( String userAgent, AuthToken authToken, RoutingCon
             message = new HelloMessage( userAgent, ( ( InternalAuthToken ) authToken ).toMap(), null );
         }
 
-        HelloResponseHandler handler = new HelloResponseHandler( channelInitializedPromise, version() );
+        HelloResponseHandler handler = new HelloResponseHandler( channelInitializedPromise );
 
         messageDispatcher( channel ).enqueue( handler );
         channel.writeAndFlush( message, channel.voidPromise() );

diff --git a/driver/src/main/java/org/neo4j/driver/internal/spi/Connection.java b/driver/src/main/java/org/neo4j/driver/internal/spi/Connection.java
@@ -25,7 +25,6 @@
 import org.neo4j.driver.internal.DatabaseName;
 import org.neo4j.driver.internal.messaging.BoltProtocol;
 import org.neo4j.driver.internal.messaging.Message;
-import org.neo4j.driver.internal.util.ServerVersion;
 
 import static java.lang.String.format;
 
@@ -55,8 +54,6 @@ public interface Connection
 
     BoltServerAddress serverAddress();
 
-    ServerVersion serverVersion();
-
     BoltProtocol protocol();
 
     default AccessMode mode()

diff --git a/driver/src/main/java/org/neo4j/driver/internal/summary/InternalServerInfo.java b/driver/src/main/java/org/neo4j/driver/internal/summary/InternalServerInfo.java
@@ -22,21 +22,20 @@
 
 import org.neo4j.driver.internal.BoltServerAddress;
 import org.neo4j.driver.internal.messaging.BoltProtocolVersion;
-import org.neo4j.driver.internal.util.ServerVersion;
 import org.neo4j.driver.summary.ServerInfo;
 
 public class InternalServerInfo implements ServerInfo
 {
+    private static final String TO_STRING_FMT = "%s{address='%s'}";
+
     private final String agent;
     private final String address;
-    private final String version;
     private final String protocolVersion;
 
-    public InternalServerInfo( String agent, BoltServerAddress address, ServerVersion version, BoltProtocolVersion protocolVersion )
+    public InternalServerInfo( String agent, BoltServerAddress address, BoltProtocolVersion protocolVersion )
     {
         this.agent = agent;
         this.address = address.toString();
-        this.version = version.toString();
         this.protocolVersion = protocolVersion.toString();
     }
 
@@ -52,12 +51,6 @@ public String address()
         return address;
     }
 
-    @Override
-    public String version()
-    {
-        return version;
-    }
-
     @Override
     public String protocolVersion()
     {
@@ -76,18 +69,18 @@ public boolean equals( Object o )
             return false;
         }
         InternalServerInfo that = (InternalServerInfo) o;
-        return Objects.equals( address, that.address ) && Objects.equals( version, that.version );
+        return Objects.equals( address, that.address );
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash( address, version );
+        return Objects.hash( address );
     }
 
     @Override
     public String toString()
     {
-        return "InternalServerInfo{" + "address='" + address + '\'' + ", version='" + version + '\'' + '}';
+        return String.format( TO_STRING_FMT, this.getClass().getSimpleName(), address );
     }
 }