diff --git a/community/security/src/main/java/org/neo4j/commandline/admin/security/SetInitialPasswordCommand.java b/community/security/src/main/java/org/neo4j/commandline/admin/security/SetInitialPasswordCommand.java index 734e208dd00fa..f9710ff703f1d 100644 --- a/community/security/src/main/java/org/neo4j/commandline/admin/security/SetInitialPasswordCommand.java +++ b/community/security/src/main/java/org/neo4j/commandline/admin/security/SetInitialPasswordCommand.java @@ -40,6 +40,8 @@ import org.neo4j.server.security.auth.FileUserRepository; import org.neo4j.server.security.auth.User; +import static org.neo4j.server.security.auth.UserManager.INITIAL_USER_NAME; + public class SetInitialPasswordCommand implements AdminCommand { public static class Provider extends AdminCommand.Provider @@ -69,7 +71,6 @@ public AdminCommand create( Path homeDir, Path configDir, OutsideWorld outsideWo } } - private static final String INITIAL_USER_NAME = "neo4j"; private final Path homeDir; private final Path configDir; private OutsideWorld outsideWorld; diff --git a/community/security/src/main/java/org/neo4j/server/security/auth/BasicAuthManager.java b/community/security/src/main/java/org/neo4j/server/security/auth/BasicAuthManager.java index 34d9115b2c988..42cf14166bd1e 100644 --- a/community/security/src/main/java/org/neo4j/server/security/auth/BasicAuthManager.java +++ b/community/security/src/main/java/org/neo4j/server/security/auth/BasicAuthManager.java @@ -33,6 +33,8 @@ import org.neo4j.kernel.api.security.exception.InvalidAuthTokenException; import org.neo4j.server.security.auth.exception.ConcurrentModificationException; +import static org.neo4j.server.security.auth.UserManager.INITIAL_USER_NAME; + /** * Manages server authentication and authorization. *
@@ -79,10 +81,10 @@ public void start() throws Throwable
if ( userRepository.numberOfUsers() == 0 )
{
- User neo4j = newUser( "neo4j", "neo4j", true );
+ User neo4j = newUser( INITIAL_USER_NAME, "neo4j", true );
if ( initialUserRepository.numberOfUsers() > 0 )
{
- User user = initialUserRepository.getUserByName( "neo4j" );
+ User user = initialUserRepository.getUserByName( INITIAL_USER_NAME );
if ( user != null )
{
userRepository.update( neo4j, user );
diff --git a/community/security/src/main/java/org/neo4j/server/security/auth/UserManager.java b/community/security/src/main/java/org/neo4j/server/security/auth/UserManager.java
index af148ff984b23..e7ee31814eb51 100644
--- a/community/security/src/main/java/org/neo4j/server/security/auth/UserManager.java
+++ b/community/security/src/main/java/org/neo4j/server/security/auth/UserManager.java
@@ -26,6 +26,8 @@
public interface UserManager
{
+ String INITIAL_USER_NAME = "neo4j";
+
User newUser( String username, String initialPassword, boolean requirePasswordChange )
throws IOException, InvalidArgumentsException;
diff --git a/community/security/src/test/java/org/neo4j/commandline/admin/security/SetInitialPasswordCommandIT.java b/community/security/src/test/java/org/neo4j/commandline/admin/security/SetInitialPasswordCommandIT.java
index 838e1b8cb3a4c..3092f8f85436f 100644
--- a/community/security/src/test/java/org/neo4j/commandline/admin/security/SetInitialPasswordCommandIT.java
+++ b/community/security/src/test/java/org/neo4j/commandline/admin/security/SetInitialPasswordCommandIT.java
@@ -32,6 +32,7 @@
import org.neo4j.logging.NullLogProvider;
import org.neo4j.server.security.auth.FileUserRepository;
import org.neo4j.server.security.auth.User;
+import org.neo4j.server.security.auth.UserManager;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -108,7 +109,7 @@ private void assertAuthIniFile(String password) throws Throwable
assertTrue( fileSystem.fileExists( authIniFile ) );
FileUserRepository userRepository = new FileUserRepository( fileSystem, authIniFile, NullLogProvider.getInstance() );
userRepository.start();
- User neo4j = userRepository.getUserByName( "neo4j" );
+ User neo4j = userRepository.getUserByName( UserManager.INITIAL_USER_NAME );
assertNotNull( neo4j );
assertTrue( neo4j.credentials().matchesPassword( password ) );
assertFalse( neo4j.hasFlag( User.PASSWORD_CHANGE_REQUIRED ) );
diff --git a/community/security/src/test/java/org/neo4j/commandline/admin/security/SetInitialPasswordCommandTest.java b/community/security/src/test/java/org/neo4j/commandline/admin/security/SetInitialPasswordCommandTest.java
index ae94ee649f15d..3e8be39eb4120 100644
--- a/community/security/src/test/java/org/neo4j/commandline/admin/security/SetInitialPasswordCommandTest.java
+++ b/community/security/src/test/java/org/neo4j/commandline/admin/security/SetInitialPasswordCommandTest.java
@@ -35,6 +35,7 @@
import org.neo4j.server.security.auth.CommunitySecurityModule;
import org.neo4j.server.security.auth.FileUserRepository;
import org.neo4j.server.security.auth.User;
+import org.neo4j.server.security.auth.UserManager;
import org.neo4j.test.rule.TestDirectory;
import static org.junit.Assert.assertFalse;
@@ -124,7 +125,7 @@ private void assertAuthIniFile( String password ) throws Throwable
FileUserRepository userRepository = new FileUserRepository( fileSystem, authInitFile,
NullLogProvider.getInstance() );
userRepository.start();
- User neo4j = userRepository.getUserByName( "neo4j" );
+ User neo4j = userRepository.getUserByName( UserManager.INITIAL_USER_NAME );
assertNotNull( neo4j );
assertTrue( neo4j.credentials().matchesPassword( password ) );
assertFalse( neo4j.hasFlag( User.PASSWORD_CHANGE_REQUIRED ) );
diff --git a/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealm.java b/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealm.java
index 2f6e7bbf9e996..8e31264ec6e10 100644
--- a/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealm.java
+++ b/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealm.java
@@ -212,16 +212,16 @@ private Set