Made AuthManager available to Bolt

neo4j · Feb 21, 2016 · 4cea1e9 · 4cea1e9
1 parent 85a29bf
commit 4cea1e9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java b/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java
@@ -63,6 +63,7 @@
 import org.neo4j.kernel.lifecycle.Lifecycle;
 import org.neo4j.kernel.monitoring.Monitors;
 import org.neo4j.logging.Log;
+import org.neo4j.server.security.auth.AuthManager;
 import org.neo4j.udc.UsageData;
 
 import static org.neo4j.bolt.BoltKernelExtension.EncryptionLevel.OPTIONAL;
@@ -169,6 +170,8 @@ public interface Dependencies
         UsageData usageData();
 
         Monitors monitors();
+
+        AuthManager authManager();
     }
 
     public BoltKernelExtension()
@@ -225,7 +228,7 @@ public Lifecycle newInstance( KernelContext context, Dependencies dependencies )
 
                 connectors.add( new SocketTransport( socketAddress, sslCtx, logging.getInternalLogProvider(),
                         newVersions( logging,
-                                requireEncryption ? new EncryptionRequiredSessions( sessions ) : sessions ) ) );
+                                requireEncryption ? new EncryptionRequiredSessions( sessions ) : sessions, dependencies.authManager() ) ) );
             }
         }
 
@@ -239,12 +242,12 @@ public Lifecycle newInstance( KernelContext context, Dependencies dependencies )
     }
 
     private PrimitiveLongObjectMap<BiFunction<Channel,Boolean,BoltProtocol>> newVersions( LogService logging,
-            Sessions sessions )
+            Sessions sessions, AuthManager authManager )
     {
         PrimitiveLongObjectMap<BiFunction<Channel,Boolean,BoltProtocol>> availableVersions = longObjectMap();
         availableVersions.put(
                 BoltProtocolV1.VERSION,
-                ( channel, isEncrypted ) -> new BoltProtocolV1( logging, sessions.newSession( isEncrypted ), channel )
+                ( channel, isEncrypted ) -> new BoltProtocolV1( logging, sessions.newSession( isEncrypted ), channel, authManager )
         );
         return availableVersions;
     }

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/msgprocess/TransportBridge.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/msgprocess/TransportBridge.java
@@ -27,6 +27,7 @@
 import org.neo4j.bolt.v1.runtime.StatementMetadata;
 import org.neo4j.bolt.v1.runtime.spi.RecordStream;
 import org.neo4j.logging.Log;
+import org.neo4j.server.security.auth.AuthManager;
 
 /** Bridges the gap between incoming deserialized messages, the user environment and back. */
 public class TransportBridge extends MessageHandler.Adapter<RuntimeException>
@@ -36,11 +37,12 @@ public class TransportBridge extends MessageHandler.Adapter<RuntimeException>
     private final MessageProcessingCallback<StatementMetadata> runCallback;
     private final MessageProcessingCallback<RecordStream> resultStreamCallback;
     private final MessageProcessingCallback<Void> simpleCallback;
+    private final AuthManager authManager;
 
     private Session session;
 
     public TransportBridge( Log log, Session session, MessageHandler<IOException> output,
-            Runnable onEachCompletedRequest )
+            Runnable onEachCompletedRequest, AuthManager authManager )
     {
         this.resultStreamCallback = new RecordStreamCallback( log );
         this.simpleCallback = new MessageProcessingCallback<>( log );
@@ -49,11 +51,13 @@ public TransportBridge( Log log, Session session, MessageHandler<IOException> ou
         this.simpleCallback.reset( output, onEachCompletedRequest );
         this.resultStreamCallback.reset( output, onEachCompletedRequest );
         this.runCallback.reset( output, onEachCompletedRequest );
+        this.authManager = authManager;
     }
 
     @Override
     public void handleInitMessage( String clientName ) throws RuntimeException
     {
+        //TODO do auth here
         session.init( clientName, null, simpleCallback );
     }
 

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/transport/BoltProtocolV1.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/transport/BoltProtocolV1.java
@@ -35,6 +35,7 @@
 import org.neo4j.bolt.v1.runtime.internal.Neo4jError;
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.logging.Log;
+import org.neo4j.server.security.auth.AuthManager;
 
 import static org.neo4j.bolt.v1.messaging.msgprocess.MessageProcessingCallback.publishError;
 
@@ -58,15 +59,15 @@ public class BoltProtocolV1 implements BoltProtocol
     private final Log log;
     private final AtomicInteger inFlight = new AtomicInteger( 0 );
 
-    public BoltProtocolV1( final LogService logging, Session session, Channel channel )
+    public BoltProtocolV1( final LogService logging, Session session, Channel channel, AuthManager authManager )
     {
         this.log = logging.getInternalLog( getClass() );
         this.session = session;
         this.output = new ChunkedOutput( channel, DEFAULT_BUFFER_SIZE );
         this.packer = new PackStreamMessageFormatV1.Writer( new Neo4jPack.Packer( output ), output );
 
         this.dechunker = new BoltV1Dechunker(
-                new TransportBridge( log, session, packer, this::onMessageDone ),
+                new TransportBridge( log, session, packer, this::onMessageDone, authManager ),
                 this::onMessageStarted );
     }
 

diff --git a/.../bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/FragmentedMessageDeliveryTest.java b/.../bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/FragmentedMessageDeliveryTest.java
@@ -38,6 +38,7 @@
 import org.neo4j.bolt.v1.transport.BoltProtocolV1;
 import org.neo4j.kernel.impl.logging.NullLogService;
 import org.neo4j.kernel.impl.util.HexPrinter;
+import org.neo4j.server.security.auth.AuthManager;
 
 import static io.netty.buffer.Unpooled.wrappedBuffer;
 import static org.mockito.Matchers.any;
@@ -115,7 +116,7 @@ private void testPermutation( byte[] unfragmented, ByteBuf[] fragments ) throws
         ChannelHandlerContext ctx = mock( ChannelHandlerContext.class );
         when(ctx.channel()).thenReturn( ch );
 
-        BoltProtocolV1 protocol = new BoltProtocolV1( NullLogService.getInstance(), sess, ch );
+        BoltProtocolV1 protocol = new BoltProtocolV1( NullLogService.getInstance(), sess, ch, mock( AuthManager.class) );
 
         // When data arrives split up according to the current permutation
         for ( ByteBuf fragment : fragments )

diff --git a/...ity/bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/SocketTransportHandlerTest.java b/...ity/bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/SocketTransportHandlerTest.java
@@ -35,6 +35,7 @@
 import org.neo4j.kernel.impl.logging.NullLogService;
 import org.neo4j.logging.AssertableLogProvider;
 import org.neo4j.logging.NullLogProvider;
+import org.neo4j.server.security.auth.AuthManager;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
@@ -103,7 +104,8 @@ private SocketTransportHandler.ProtocolChooser protocolChooser( final Session se
     {
         PrimitiveLongObjectMap<BiFunction<Channel,Boolean,BoltProtocol>> availableVersions = longObjectMap();
         availableVersions.put( BoltProtocolV1.VERSION,
-                ( channel, isSecure ) -> new BoltProtocolV1( NullLogService.getInstance(), session, channel )
+                ( channel, isSecure ) -> new BoltProtocolV1( NullLogService.getInstance(), session, channel, mock(
+                        AuthManager.class ) )
         );
 
         return new SocketTransportHandler.ProtocolChooser( availableVersions, true );