Merge remote-tracking branch 'origin/3.3' into 3.4

neo4j · Mar 19, 2018 · 74ad7bd · 74ad7bd
2 parents fd6ae5d + 169513a
commit 74ad7bd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/...clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java b/...clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java
@@ -177,7 +177,7 @@ public void registerEditionSpecificProcedures( Procedures procedures ) throws Ke
         procedures.register( new ClusterOverviewProcedure( topologyService, logProvider ) );
         procedures.register( new CoreRoleProcedure( consensusModule.raftMachine() ) );
         procedures.register( new InstalledProtocolsProcedure( clientInstalledProtocols, serverInstalledProtocols ) );
-        procedures.registerComponent( Replicator.class, x -> replicationModule.getReplicator(), true );
+        procedures.registerComponent( Replicator.class, x -> replicationModule.getReplicator(), false );
         procedures.registerProcedure( ReplicationBenchmarkProcedure.class );
     }
 

diff --git a/.../main/java/org/neo4j/causalclustering/core/replication/ReplicationBenchmarkProcedure.java b/.../main/java/org/neo4j/causalclustering/core/replication/ReplicationBenchmarkProcedure.java
@@ -25,13 +25,16 @@
 import java.util.stream.Stream;
 
 import org.neo4j.causalclustering.core.state.machines.dummy.DummyRequest;
+import org.neo4j.graphdb.security.AuthorizationViolationException;
+import org.neo4j.internal.kernel.api.security.SecurityContext;
 import org.neo4j.logging.Log;
 import org.neo4j.procedure.Context;
 import org.neo4j.procedure.Description;
 import org.neo4j.procedure.Name;
 import org.neo4j.procedure.Procedure;
 
 import static java.lang.Math.toIntExact;
+import static org.neo4j.graphdb.security.AuthorizationViolationException.PERMISSION_DENIED;
 import static org.neo4j.procedure.Mode.DBMS;
 
 @SuppressWarnings( "unused" )
@@ -40,6 +43,9 @@ public class ReplicationBenchmarkProcedure
     @Context
     public Replicator replicator;
 
+    @Context
+    public SecurityContext securityContext;
+
     @Context
     public Log log;
 
@@ -50,6 +56,8 @@ public class ReplicationBenchmarkProcedure
     @Procedure( name = "dbms.cluster.benchmark.start", mode = DBMS )
     public synchronized void start( @Name( "nThreads" ) Long nThreads, @Name( "blockSize" ) Long blockSize )
     {
+        checkSecurity();
+
         if ( workers != null )
         {
             throw new IllegalStateException( "Already running." );
@@ -72,6 +80,8 @@ public synchronized void start( @Name( "nThreads" ) Long nThreads, @Name( "block
     @Procedure( name = "dbms.cluster.benchmark.stop", mode = DBMS )
     public synchronized Stream<BenchmarkResult> stop() throws InterruptedException
     {
+        checkSecurity();
+
         if ( workers == null )
         {
             throw new IllegalStateException( "Not running." );
@@ -105,6 +115,15 @@ public synchronized Stream<BenchmarkResult> stop() throws InterruptedException
         return Stream.of( new BenchmarkResult( totalRequests, totalBytes, runTime ) );
     }
 
+    private void checkSecurity() throws AuthorizationViolationException
+    {
+        securityContext.assertCredentialsNotExpired();
+        if ( !securityContext.isAdmin() )
+        {
+            throw new AuthorizationViolationException( PERMISSION_DENIED );
+        }
+    }
+
     private class Worker implements Runnable
     {
         private final int blockSize;