From 889600a5dcbb729faa11186d2d3d2f5610a7ede3 Mon Sep 17 00:00:00 2001 From: Mats Rydberg Date: Wed, 31 Aug 2016 13:46:52 +0200 Subject: [PATCH] Move security log setting to `SecuritySettings` --- .../neo4j/graphdb/factory/GraphDatabaseSettings.java | 6 ------ .../enterprise/auth/EnterpriseAuthManagerFactory.java | 4 +++- .../security/enterprise/auth/SecuritySettings.java | 10 ++++++++++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java index 17afc95adcd1..cf893057e8bf 100644 --- a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java +++ b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java @@ -519,12 +519,6 @@ private static String defaultPageCacheMemory() @Internal public static final Setting auth_manager = setting( "unsupported.dbms.security.auth_manager", STRING, "" ); - @Internal - public static final Setting security_log_filename = derivedSetting("dbms.security.log_path", - logs_directory, - ( logs ) -> new File( logs, "security.log" ), - PATH ); - // Bolt Settings @Description("Default network interface to listen for incoming connections. " + diff --git a/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseAuthManagerFactory.java b/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseAuthManagerFactory.java index 89a8a3036ffb..014595f6ca9c 100644 --- a/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseAuthManagerFactory.java +++ b/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseAuthManagerFactory.java @@ -29,6 +29,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.shiro.realm.Realm; + import org.neo4j.dbms.DatabaseManagementSystemSettings; import org.neo4j.helpers.Service; import org.neo4j.io.fs.FileSystemAbstraction; @@ -45,9 +47,9 @@ import org.neo4j.server.security.auth.UserRepository; import org.neo4j.time.Clocks; -import static org.neo4j.graphdb.factory.GraphDatabaseSettings.security_log_filename; import static org.neo4j.io.file.Files.createOrOpenAsOuputStream; import static org.neo4j.server.security.auth.BasicAuthManagerFactory.getUserRepository; +import static org.neo4j.server.security.enterprise.auth.SecuritySettings.security_log_filename; /** * Wraps EnterpriseAuthManager and exposes it as a Service diff --git a/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/SecuritySettings.java b/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/SecuritySettings.java index 78e1dc443f93..9b7900e4ef76 100644 --- a/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/SecuritySettings.java +++ b/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/SecuritySettings.java @@ -19,10 +19,12 @@ */ package org.neo4j.server.security.enterprise.auth; +import java.io.File; import java.util.List; import org.neo4j.graphdb.config.Setting; import org.neo4j.graphdb.factory.Description; +import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.helpers.HostnamePort; import static org.neo4j.kernel.configuration.Settings.BOOLEAN; @@ -30,8 +32,10 @@ import static org.neo4j.kernel.configuration.Settings.HOSTNAME_PORT; import static org.neo4j.kernel.configuration.Settings.INTEGER; import static org.neo4j.kernel.configuration.Settings.NO_DEFAULT; +import static org.neo4j.kernel.configuration.Settings.PATH; import static org.neo4j.kernel.configuration.Settings.STRING; import static org.neo4j.kernel.configuration.Settings.STRING_LIST; +import static org.neo4j.kernel.configuration.Settings.derivedSetting; import static org.neo4j.kernel.configuration.Settings.setting; /** @@ -151,4 +155,10 @@ public class SecuritySettings @Description( "The maximum capacity for authentication and authorization caches (respectively)." ) public static Setting auth_cache_max_capacity = setting( "dbms.security.realms.auth_cache_max_capacity", INTEGER, "10000" ); + + @Description( "File name for the security log." ) + public static final Setting security_log_filename = derivedSetting("dbms.security.log_path", + GraphDatabaseSettings.logs_directory, + ( logs ) -> new File( logs, "security.log" ), + PATH ); }