Revert "Merge pull request #10887 from OliviaYtterbrink/3.4-property-…

…level-security" This reverts commit a8f91bb, reversing changes made to ad06dba.
neo4j · Feb 7, 2018 · 7c3134b · 7c3134b
1 parent a8f91bb
commit 7c3134b
Show file tree

Hide file tree

Showing 142 changed files with 970 additions and 1,744 deletions.
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/security/auth/AuthenticationResult.java b/community/bolt/src/main/java/org/neo4j/bolt/security/auth/AuthenticationResult.java
@@ -19,20 +19,20 @@
  */
 package org.neo4j.bolt.security.auth;
 
-import org.neo4j.internal.kernel.api.security.LoginContext;
+import org.neo4j.internal.kernel.api.security.SecurityContext;
 
 public interface AuthenticationResult
 {
-    LoginContext getLoginContext();
+    SecurityContext getSecurityContext();
 
     boolean credentialsExpired();
 
     AuthenticationResult AUTH_DISABLED = new AuthenticationResult()
     {
         @Override
-        public LoginContext getLoginContext()
+        public SecurityContext getSecurityContext()
         {
-            return LoginContext.AUTH_DISABLED;
+            return SecurityContext.AUTH_DISABLED;
         }
 
         @Override

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/security/auth/BasicAuthentication.java b/community/bolt/src/main/java/org/neo4j/bolt/security/auth/BasicAuthentication.java
@@ -23,11 +23,11 @@
 import java.util.Map;
 
 import org.neo4j.graphdb.security.AuthorizationViolationException;
-import org.neo4j.internal.kernel.api.security.LoginContext;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.kernel.api.security.AuthManager;
 import org.neo4j.kernel.api.security.AuthToken;
 import org.neo4j.kernel.api.exceptions.InvalidArgumentsException;
+import org.neo4j.internal.kernel.api.security.SecurityContext;
 import org.neo4j.kernel.api.security.UserManagerSupplier;
 import org.neo4j.kernel.api.security.exception.InvalidAuthTokenException;
 
@@ -53,7 +53,7 @@ public AuthenticationResult authenticate( Map<String,Object> authToken ) throws
     {
         if ( authToken.containsKey( NEW_CREDENTIALS ) )
         {
-            return update( authToken );
+            return update( authToken, false );
         }
         else
         {
@@ -65,9 +65,9 @@ private AuthenticationResult doAuthenticate( Map<String,Object> authToken ) thro
     {
         try
         {
-            LoginContext loginContext = authManager.login( authToken );
+            SecurityContext securityContext = authManager.login( authToken );
 
-            switch ( loginContext.subject().getAuthenticationResult() )
+            switch ( securityContext.subject().getAuthenticationResult() )
             {
             case SUCCESS:
             case PASSWORD_CHANGE_REQUIRED:
@@ -78,36 +78,36 @@ private AuthenticationResult doAuthenticate( Map<String,Object> authToken ) thro
                 throw new AuthenticationException( Status.Security.Unauthorized );
             }
 
-            return new BasicAuthenticationResult( loginContext );
+            return new BasicAuthenticationResult( securityContext );
         }
         catch ( InvalidAuthTokenException e )
         {
             throw new AuthenticationException( e.status(), e.getMessage() );
         }
     }
 
-    private AuthenticationResult update( Map<String,Object> authToken )
+    private AuthenticationResult update( Map<String,Object> authToken, boolean requiresPasswordChange )
             throws AuthenticationException
     {
         try
         {
-            LoginContext loginContext = authManager.login( authToken );
+            SecurityContext securityContext = authManager.login( authToken );
 
-            switch ( loginContext.subject().getAuthenticationResult() )
+            switch ( securityContext.subject().getAuthenticationResult() )
             {
             case SUCCESS:
             case PASSWORD_CHANGE_REQUIRED:
                 String newPassword = AuthToken.safeCast( NEW_CREDENTIALS, authToken );
                 String username = AuthToken.safeCast( PRINCIPAL, authToken );
-                userManagerSupplier.getUserManager( loginContext.subject(), false )
+                userManagerSupplier.getUserManager( securityContext )
-                        .setUserPassword( username, newPassword, false );
+                        .setUserPassword( username, newPassword, requiresPasswordChange );
-                loginContext.subject().setPasswordChangeNoLongerRequired();
+                securityContext.subject().setPasswordChangeNoLongerRequired();
                 break;
             default:
                 throw new AuthenticationException( Status.Security.Unauthorized );
             }
 
-            return new BasicAuthenticationResult( loginContext );
+            return new BasicAuthenticationResult( securityContext );
         }
         catch ( AuthorizationViolationException | InvalidArgumentsException | InvalidAuthTokenException e )
         {

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/security/auth/BasicAuthenticationResult.java b/community/bolt/src/main/java/org/neo4j/bolt/security/auth/BasicAuthenticationResult.java
@@ -19,27 +19,27 @@
  */
 package org.neo4j.bolt.security.auth;
 
-import org.neo4j.internal.kernel.api.security.LoginContext;
+import org.neo4j.internal.kernel.api.security.SecurityContext;
 
 public class BasicAuthenticationResult implements AuthenticationResult
 {
-    private LoginContext loginContext;
+    private SecurityContext securityContext;
 
-    public BasicAuthenticationResult( LoginContext loginContext )
+    public BasicAuthenticationResult( SecurityContext securityContext )
     {
-        this.loginContext = loginContext;
+        this.securityContext = securityContext;
     }
 
     @Override
-    public LoginContext getLoginContext()
+    public SecurityContext getSecurityContext()
     {
-        return loginContext;
+        return securityContext;
     }
 
     @Override
     public boolean credentialsExpired()
     {
-        return loginContext.subject().getAuthenticationResult() ==
+        return securityContext.subject().getAuthenticationResult() ==
                 org.neo4j.internal.kernel.api.security.AuthenticationResult.PASSWORD_CHANGE_REQUIRED;
     }
 }
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachine.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachine.java
@@ -31,8 +31,8 @@
 import org.neo4j.function.ThrowingAction;
 import org.neo4j.function.ThrowingConsumer;
 import org.neo4j.graphdb.TransactionTerminatedException;
-import org.neo4j.internal.kernel.api.security.LoginContext;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
+import org.neo4j.internal.kernel.api.security.SecurityContext;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.kernel.api.exceptions.TransactionFailureException;
@@ -195,7 +195,7 @@ State run( MutableTransactionState ctx, SPI spi, String statement,
                     {
                         if ( BEGIN.matcher( statement ).matches() )
                         {
-                            ctx.currentTransaction = spi.beginTransaction( ctx.loginContext );
+                            ctx.currentTransaction = spi.beginTransaction( ctx.securityContext );
 
                             Bookmark bookmark = Bookmark.fromParamsOrNull( params );
                             if ( bookmark != null )
@@ -241,7 +241,7 @@ else if ( ROLLBACK.matcher( statement ).matches() )
                             }
                             else
                             {
-                                ctx.currentTransaction = spi.beginTransaction( ctx.loginContext );
+                                ctx.currentTransaction = spi.beginTransaction( ctx.securityContext );
                                 BoltResultHandle resultHandle = execute( ctx, spi, statement, params );
                                 ctx.currentResultHandle = resultHandle;
                                 ctx.currentResult = resultHandle.start();
@@ -407,7 +407,7 @@ private static BoltResultHandle executeQuery( MutableTransactionState ctx, SPI s
                                                   MapValue params, ThrowingAction<KernelException> onFail )
             throws QueryExecutionKernelException
     {
-        return spi.executeQuery( ctx.querySource, ctx.loginContext, statement, params, onFail );
+        return spi.executeQuery( ctx.querySource, ctx.securityContext, statement, params, onFail );
     }
 
     /**
@@ -424,7 +424,7 @@ interface BoltResultHandle
     static class MutableTransactionState
     {
         /** The current session security context to be used for starting transactions */
-        final LoginContext loginContext;
+        final SecurityContext securityContext;
 
         /** The current transaction, if present */
         KernelTransaction currentTransaction;
@@ -455,7 +455,7 @@ public String[] fieldNames()
         private MutableTransactionState( AuthenticationResult authenticationResult, Clock clock )
         {
             this.clock = clock;
-            this.loginContext = authenticationResult.getLoginContext();
+            this.securityContext = authenticationResult.getSecurityContext();
         }
     }
 
@@ -465,7 +465,7 @@ interface SPI
 
         long newestEncounteredTxId();
 
-        KernelTransaction beginTransaction( LoginContext loginContext );
+        KernelTransaction beginTransaction( SecurityContext securityContext );
 
         void bindTransactionToCurrentThread( KernelTransaction tx );
 
@@ -474,7 +474,7 @@ interface SPI
         boolean isPeriodicCommit( String query );
 
         BoltResultHandle executeQuery( BoltQuerySource querySource,
-                LoginContext loginContext,
+                SecurityContext securityContext,
                 String statement,
                 MapValue params,
                 ThrowingAction<KernelException> onFail ) throws QueryExecutionKernelException;

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachineSPI.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachineSPI.java
@@ -28,12 +28,12 @@
 import org.neo4j.cypher.internal.javacompat.ExecutionResult;
 import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.function.ThrowingAction;
-import org.neo4j.internal.kernel.api.security.LoginContext;
 import org.neo4j.kernel.AvailabilityGuard;
 import org.neo4j.kernel.GraphDatabaseQueryService;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
 import org.neo4j.kernel.api.exceptions.TransactionFailureException;
+import org.neo4j.internal.kernel.api.security.SecurityContext;
 import org.neo4j.kernel.api.txtracking.TransactionIdTracker;
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 import org.neo4j.kernel.impl.coreapi.InternalTransaction;
@@ -97,9 +97,9 @@ public long newestEncounteredTxId()
     }
 
     @Override
-    public KernelTransaction beginTransaction( LoginContext loginContext )
+    public KernelTransaction beginTransaction( SecurityContext securityContext )
     {
-        db.beginTransaction( KernelTransaction.Type.explicit, loginContext );
+        db.beginTransaction( KernelTransaction.Type.explicit, securityContext );
         return txBridge.getKernelTransactionBoundToThisThread( false );
     }
 
@@ -123,11 +123,11 @@ public boolean isPeriodicCommit( String query )
 
     @Override
     public BoltResultHandle executeQuery( BoltQuerySource querySource,
-            LoginContext loginContext,
+            SecurityContext securityContext,
             String statement,
             MapValue params, ThrowingAction<KernelException> onFail ) throws QueryExecutionKernelException
     {
-        InternalTransaction internalTransaction = queryService.beginTransaction( implicit, loginContext );
+        InternalTransaction internalTransaction = queryService.beginTransaction( implicit, securityContext );
         ClientConnectionInfo sourceDetails = new BoltConnectionInfo( querySource.principalName,
                 querySource.clientName,
                 querySource.connectionDescriptor.clientAddress(),

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/security/auth/BasicAuthenticationTest.java b/community/bolt/src/test/java/org/neo4j/bolt/security/auth/BasicAuthenticationTest.java
@@ -60,7 +60,8 @@ public void shouldNotDoAnythingOnSuccess() throws Exception
                 authentication.authenticate( map( "scheme", "basic", "principal", "mike", "credentials", "secret2" ) );
 
         // Then
-        assertThat( result.getLoginContext().subject().username(), equalTo( "mike" ) );
+        assertThat(result.getSecurityContext().mode(), equalTo( AccessMode.Static.FULL));
+        assertThat( result.getSecurityContext().subject().username(), equalTo( "mike" ) );
     }
 
     @Test

diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/ManyMergesStressTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/ManyMergesStressTest.java
@@ -32,9 +32,9 @@
 import org.neo4j.graphdb.Result;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.helpers.collection.Pair;
-import org.neo4j.internal.kernel.api.security.LoginContext;
 import org.neo4j.kernel.GraphDatabaseQueryService;
 import org.neo4j.kernel.api.KernelTransaction;
+import org.neo4j.internal.kernel.api.security.SecurityContext;
 import org.neo4j.kernel.impl.coreapi.InternalTransaction;
 import org.neo4j.test.rule.EmbeddedDatabaseRule;
 
@@ -93,7 +93,7 @@ public void shouldWorkFine() throws Throwable
             String query =
                 format( "MERGE (%s:Person {id: %s}) ON CREATE SET %s.name = \"%s\";", ident, id, ident, name );
 
-            try ( InternalTransaction tx = graph.beginTransaction( KernelTransaction.Type.implicit, LoginContext.AUTH_DISABLED ) )
+            try ( InternalTransaction tx = graph.beginTransaction( KernelTransaction.Type.implicit, SecurityContext.AUTH_DISABLED ) )
             {
                 Result result = db.execute( query );
                 result.close();

diff --git a/...cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ExecutionEngineTest.java b/...cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ExecutionEngineTest.java
@@ -28,9 +28,9 @@
 
 import org.neo4j.cypher.internal.CommunityCompatibilityFactory;
 import org.neo4j.graphdb.Result;
-import org.neo4j.internal.kernel.api.security.LoginContext;
 import org.neo4j.kernel.GraphDatabaseQueryService;
 import org.neo4j.kernel.api.KernelTransaction;
+import org.neo4j.internal.kernel.api.security.SecurityContext;
 import org.neo4j.kernel.impl.coreapi.InternalTransaction;
 import org.neo4j.kernel.impl.coreapi.PropertyContainerLocker;
 import org.neo4j.kernel.impl.query.Neo4jTransactionalContextFactory;
@@ -66,7 +66,7 @@ public void shouldConvertListsAndMapsWhenPassingFromScalaToJava() throws Excepti
 
         Result result;
         try ( InternalTransaction tx = graph
-                .beginTransaction( KernelTransaction.Type.implicit, LoginContext.AUTH_DISABLED ) )
+                .beginTransaction( KernelTransaction.Type.implicit, SecurityContext.AUTH_DISABLED ) )
         {
             String query = "RETURN { key : 'Value' , collectionKey: [{ inner: 'Map1' }, { inner: 'Map2' }]}";
             TransactionalContext tc = createTransactionContext( graph, tx, query );

diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/KillQueryTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/KillQueryTest.scala
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicBoolean
 import org.neo4j.cypher.internal.{CommunityCompatibilityFactory, ExecutionEngine}
 import org.neo4j.graphdb.{TransactionTerminatedException, TransientTransactionFailureException}
 import org.neo4j.internal.kernel.api.Transaction.Type
-import org.neo4j.internal.kernel.api.security.LoginContext.AUTH_DISABLED
+import org.neo4j.internal.kernel.api.security.SecurityContext.AUTH_DISABLED
 import org.neo4j.kernel.impl.coreapi.PropertyContainerLocker
 import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo
 import org.neo4j.kernel.impl.query.{Neo4jTransactionalContextFactory, TransactionalContext, TransactionalContextFactory}

diff --git a/...er/src/test/scala/org/neo4j/cypher/internal/compiler/v3_4/ActualCostCalculationTest.scala b/...er/src/test/scala/org/neo4j/cypher/internal/compiler/v3_4/ActualCostCalculationTest.scala
@@ -38,7 +38,7 @@ import org.neo4j.cypher.internal.v3_4.expressions.{LabelToken, PropertyKeyToken,
 import org.neo4j.cypher.internal.v3_4.logical.plans.SingleQueryExpression
 import org.neo4j.graphdb._
 import org.neo4j.internal.kernel.api.Transaction.Type
-import org.neo4j.internal.kernel.api.security.LoginContext
+import org.neo4j.internal.kernel.api.security.SecurityContext
 import org.neo4j.kernel.GraphDatabaseQueryService
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge
 import org.neo4j.kernel.impl.coreapi.{InternalTransaction, PropertyContainerLocker}
@@ -344,7 +344,7 @@ class ActualCostCalculationTest extends CypherFunSuite {
     val gds = graph.asInstanceOf[GraphDatabaseCypherService].getGraphDatabaseService
 
     def withTx[T](f: InternalTransaction => T): T = {
-      val tx = graph.beginTransaction(Type.explicit, LoginContext.AUTH_DISABLED)
+      val tx = graph.beginTransaction(Type.explicit, SecurityContext.AUTH_DISABLED)
       try {
         val result = f(tx)
         tx.success()

diff --git a/...pher/src/test/scala/org/neo4j/cypher/internal/queryReduction/CypherReductionSupport.scala b/...pher/src/test/scala/org/neo4j/cypher/internal/queryReduction/CypherReductionSupport.scala
@@ -24,6 +24,7 @@ import org.neo4j.cypher.internal.compatibility.v3_4.WrappedMonitors
 import org.neo4j.cypher.internal.compatibility.v3_4.runtime._
 import org.neo4j.cypher.internal.compatibility.v3_4.runtime.executionplan.procs.ProcedureCallOrSchemaCommandExecutionPlanBuilder
 import org.neo4j.cypher.internal.compatibility.v3_4.runtime.phases.CompilationState
+import org.neo4j.cypher.internal.planner.v3_4.spi.PlanningAttributes.{Cardinalities, Solveds}
 import org.neo4j.cypher.internal.compiler.v3_4._
 import org.neo4j.cypher.internal.compiler.v3_4.phases.{CompilationContains, LogicalPlanState}
 import org.neo4j.cypher.internal.compiler.v3_4.planner.logical.idp.{IDPQueryGraphSolver, IDPQueryGraphSolverMonitor, SingleComponentPlanner, cartesianProductsOrValueJoins}
@@ -36,17 +37,16 @@ import org.neo4j.cypher.internal.frontend.v3_4.phases._
 import org.neo4j.cypher.internal.frontend.v3_4.prettifier.{ExpressionStringifier, Prettifier}
 import org.neo4j.cypher.internal.frontend.v3_4.semantics.SemanticState
 import org.neo4j.cypher.internal.javacompat.GraphDatabaseCypherService
-import org.neo4j.cypher.internal.planner.v3_4.spi.PlanningAttributes.{Cardinalities, Solveds}
 import org.neo4j.cypher.internal.planner.v3_4.spi.{IDPPlannerName, PlanContext, PlannerNameFor}
 import org.neo4j.cypher.internal.queryReduction.DDmin.Oracle
 import org.neo4j.cypher.internal.runtime.interpreted.TransactionBoundQueryContext.IndexSearchMonitor
 import org.neo4j.cypher.internal.runtime.interpreted.{TransactionBoundPlanContext, TransactionBoundQueryContext, TransactionalContextWrapper, ValueConversion}
 import org.neo4j.cypher.internal.runtime.{InternalExecutionResult, NormalMode}
-import org.neo4j.cypher.internal.util.v3_4.attribution.SequentialIdGen
+import org.neo4j.cypher.internal.util.v3_4.attribution.{IdGen, SequentialIdGen}
 import org.neo4j.cypher.internal.util.v3_4.test_helpers.{CypherFunSuite, CypherTestSupport}
 import org.neo4j.cypher.internal.{CompilerEngineDelegator, ExecutionPlan, RewindableExecutionResult}
 import org.neo4j.internal.kernel.api.Transaction
-import org.neo4j.internal.kernel.api.security.LoginContext
+import org.neo4j.internal.kernel.api.security.SecurityContext
 import org.neo4j.kernel.impl.coreapi.{InternalTransaction, PropertyContainerLocker}
 import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo.EMBEDDED_CONNECTION
 import org.neo4j.kernel.impl.query.{Neo4jTransactionalContextFactory, TransactionalContextFactory}
@@ -148,8 +148,8 @@ trait CypherReductionSupport extends CypherTestSupport with GraphIcing {
                             statement: Statement,
                             parsingBaseState: BaseState,
                             executeBefore: Option[String]): InternalExecutionResult = {
-    val explicitTx = graph.beginTransaction(Transaction.Type.explicit, LoginContext.AUTH_DISABLED)
+    val explicitTx = graph.beginTransaction(Transaction.Type.explicit, SecurityContext.AUTH_DISABLED)
-    val implicitTx = graph.beginTransaction(Transaction.Type.`implicit`, LoginContext.AUTH_DISABLED)
+    val implicitTx = graph.beginTransaction(Transaction.Type.`implicit`, SecurityContext.AUTH_DISABLED)
     try {
       executeBefore match {
         case None =>