Move logging from user manager to procedures

neo4j · Sep 12, 2016 · f6b0406 · f6b0406
1 parent db2bdfd
commit f6b0406
Show file tree

Hide file tree

Showing 9 changed files with 717 additions and 235 deletions.
diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/SecurityLog.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/SecurityLog.java
@@ -25,11 +25,13 @@
 import java.util.function.Consumer;
 
 import org.neo4j.io.fs.FileSystemAbstraction;
+import org.neo4j.kernel.api.security.AuthSubject;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.logging.FormattedLog;
 import org.neo4j.logging.Log;
 import org.neo4j.logging.Logger;
 
+import static org.neo4j.helpers.Strings.escape;
 import static org.neo4j.io.file.Files.createOrOpenAsOuputStream;
 import static org.neo4j.kernel.impl.enterprise.configuration.EnterpriseEditionSettings.security_log_filename;
 
@@ -39,10 +41,15 @@ public class SecurityLog implements Log
 
     SecurityLog( Config config, FileSystemAbstraction fileSystem )
     {
-        inner = createLog( config, fileSystem );
+        this( createLog( config, fileSystem ) );
     }
 
-    private Log createLog( Config config, FileSystemAbstraction fileSystem )
+    public SecurityLog( Log log )
+    {
+        inner = log;
+    }
+
+    private static Log createLog( Config config, FileSystemAbstraction fileSystem )
     {
         FormattedLog.Builder builder = FormattedLog.withUTCTimeZone();
         File logFile = config.get( security_log_filename );
@@ -58,6 +65,11 @@ private Log createLog( Config config, FileSystemAbstraction fileSystem )
         return builder.toOutputStream( ouputStream );
     }
 
+    private static String withSubject( AuthSubject subject, String msg )
+    {
+        return "[" + escape( subject.username() ) + "]: " + msg;
+    }
+
     @Override
     public boolean isDebugEnabled()
     {
@@ -88,6 +100,11 @@ public void debug( String format, Object... arguments )
         inner.debug( format, arguments );
     }
 
+    public void debug( AuthSubject subject, String format, Object... arguments )
+    {
+        inner.debug( withSubject( subject, format ), arguments );
+    }
+
     @Override
     public Logger infoLogger()
     {
@@ -112,6 +129,16 @@ public void info( String format, Object... arguments )
         inner.info( format, arguments );
     }
 
+    public void info( AuthSubject subject, String format, Object... arguments )
+    {
+        inner.info( withSubject( subject, format ), arguments );
+    }
+
+    public void info( AuthSubject subject, String format )
+    {
+        inner.info( withSubject( subject, format ) );
+    }
+
     @Override
     public Logger warnLogger()
     {
@@ -136,6 +163,11 @@ public void warn( String format, Object... arguments )
         inner.warn( format, arguments );
     }
 
+    public void warn( AuthSubject subject, String format, Object... arguments )
+    {
+        inner.warn( withSubject( subject, format ), arguments );
+    }
+
     @Override
     public Logger errorLogger()
     {
@@ -160,6 +192,11 @@ public void error( String format, Object... arguments )
         inner.error( format, arguments );
     }
 
+    public void error( AuthSubject subject, String format, Object... arguments )
+    {
+        inner.error( withSubject( subject, format ), arguments );
+    }
+
     @Override
     public void bulk( Consumer<Log> consumer )
     {