Load auth manager in ha and core-edge

community/kernel/src/main/java/org/neo4j/kernel/impl/factory/CommunityEditionModule.java

@@ -29,7 +29,6 @@
 import org.neo4j.io.pagecache.PageCache;
 import org.neo4j.kernel.DatabaseAvailability;
 import org.neo4j.kernel.NeoStoreDataSource;
-import org.neo4j.kernel.api.security.AuthManager;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.api.SchemaWriteGuard;
 import org.neo4j.kernel.impl.api.index.RemoveOrphanConstraintIndexesOnStartup;
@@ -210,40 +209,6 @@ else if ( key.equals( "" ) )
         throw new IllegalArgumentException( "No lock manager found with the name '" + key + "'." );
     }
 
-    public static AuthManager createAuthManager( Config config, LogService logging )
-    {
-        boolean authEnabled = config.get( GraphDatabaseSettings.auth_enabled );
-        if ( !authEnabled )
-        {
-            return AuthManager.NO_AUTH;
-        }
-
-        String key = config.get( GraphDatabaseSettings.auth_manager );
-        for ( AuthManager.Factory candidate : Service.load( AuthManager.Factory.class ) )
-        {
-            String candidateId = candidate.getKeys().iterator().next();
-            if ( candidateId.equals( key ) )
-            {
-                return candidate.newInstance( config, logging.getUserLogProvider() );
-            }
-            else if ( key.equals( "" ) )
-            {
-                logging.getInternalLog( CommunityFacadeFactory.class )
-                        .info( "No auth manager implementation specified, defaulting to '" + candidateId + "'" );
-                return candidate.newInstance( config, logging.getUserLogProvider() );
-            }
-        }
-
-        if ( key.equals( "" ) )
-        {
-            logging.getUserLog( CommunityFacadeFactory.class )
-                    .error( "No auth manager implementation specified and no default could be loaded." );
-            throw new IllegalArgumentException( "No auth manager found." );
-        }
-
-        throw new IllegalArgumentException( "No auth manager found with the name '" + key + "'." );
-    }
-
     protected TransactionHeaderInformationFactory createHeaderInformationFactory()
     {
         return TransactionHeaderInformationFactory.DEFAULT;

community/kernel/src/main/java/org/neo4j/kernel/impl/factory/EditionModule.java

@@ -19,11 +19,12 @@
  */
 package org.neo4j.kernel.impl.factory;
 
-import java.io.File;
-
 import org.neo4j.graphdb.DependencyResolver;
+import org.neo4j.graphdb.factory.GraphDatabaseSettings;
+import org.neo4j.helpers.Service;
 import org.neo4j.io.pagecache.IOLimiter;
 import org.neo4j.kernel.NeoStoreDataSource;
+import org.neo4j.kernel.api.security.AuthManager;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.api.CommitProcessFactory;
 import org.neo4j.kernel.impl.api.SchemaWriteGuard;
@@ -34,6 +35,7 @@
 import org.neo4j.kernel.impl.coreapi.CoreAPIAvailabilityGuard;
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory.Configuration;
 import org.neo4j.kernel.impl.locking.Locks;
+import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.kernel.impl.store.format.RecordFormats;
 import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
 import org.neo4j.kernel.impl.transaction.TransactionHeaderInformationFactory;
@@ -102,4 +104,38 @@ protected EditionModule.SPI spi()
     {
         return null;
     }
+
+    public static AuthManager createAuthManager( Config config, LogService logging )
+    {
+        boolean authEnabled = config.get( GraphDatabaseSettings.auth_enabled );
+        if ( !authEnabled )
+        {
+            return AuthManager.NO_AUTH;
+        }
+
+        String key = config.get( GraphDatabaseSettings.auth_manager );
+        for ( AuthManager.Factory candidate : Service.load( AuthManager.Factory.class ) )
+        {
+            String candidateId = candidate.getKeys().iterator().next();
+            if ( candidateId.equals( key ) )
+            {
+                return candidate.newInstance( config, logging.getUserLogProvider() );
+            }
+            else if ( key.equals( "" ) )
+            {
+                logging.getInternalLog( CommunityFacadeFactory.class )
+                        .info( "No auth manager implementation specified, defaulting to '" + candidateId + "'" );
+                return candidate.newInstance( config, logging.getUserLogProvider() );
+            }
+        }
+
+        if ( key.equals( "" ) )
+        {
+            logging.getUserLog( CommunityFacadeFactory.class )
+                    .error( "No auth manager implementation specified and no default could be loaded." );
+            throw new IllegalArgumentException( "No auth manager found." );
+        }
+
+        throw new IllegalArgumentException( "No auth manager found with the name '" + key + "'." );
+    }
 }

enterprise/core-edge/pom.xml

@@ -119,6 +119,12 @@
         <scope>test</scope>
       </dependency>
 
+      <dependency>
+        <groupId>org.neo4j</groupId>
+        <artifactId>neo4j-security-enterprise</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-logging</artifactId>

enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/EnterpriseCoreEditionModule.java

@@ -450,6 +450,8 @@ fileSystem, new File( clusterStateDirectory, "id-allocation-state" ), "id-alloca
         dependencies.satisfyDependency( createKernelData( fileSystem, platformModule.pageCache, storeDir,
                 config, graphDatabaseFacade, life ) );
 
+        life.add( dependencies.satisfyDependency( createAuthManager( config, logging ) ) );
+
         headerInformationFactory = createHeaderInformationFactory();
 
         schemaWriteGuard = createSchemaWriteGuard();

enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/EnterpriseEdgeEditionModule.java

@@ -119,6 +119,9 @@ public EnterpriseEdgeEditionModule( final PlatformModule platformModule,
 
         life.add( dependencies.satisfyDependency(
                 new DefaultKernelData( fileSystem, pageCache, storeDir, config, graphDatabaseFacade ) ) );
+
+        life.add( dependencies.satisfyDependency( createAuthManager( config, logging ) ) );
+
         headerInformationFactory = TransactionHeaderInformationFactory.DEFAULT;
 
         schemaWriteGuard = () -> {};

enterprise/ha/pom.xml

@@ -100,6 +100,11 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.neo4j</groupId>
+      <artifactId>neo4j-security-enterprise</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>junit</groupId>

enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java

@@ -478,6 +478,9 @@ public void elected( String role, InstanceId instanceId, URI electedMember )
         dependencies.satisfyDependency(
                 createKernelData( config, platformModule.graphDatabaseFacade, members, fs, platformModule.pageCache,
                         storeDir, lastUpdateTime, lastTxIdGetter, life ) );
+
+        life.add( dependencies.satisfyDependency( createAuthManager( config, logging ) ) );
+
         commitProcessFactory = createCommitProcessFactory( dependencies, logging, monitors, config, paxosLife,
                 clusterClient, members, platformModule.jobScheduler, master, requestContextFactory,
                 componentSwitcherContainer, logEntryReader );