Rename hasRole() to allowsProcedureWith()

neo4j · Aug 31, 2016 · 63ff323 · 63ff323
1 parent 00bb8f3
commit 63ff323
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/...pher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala b/...pher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala
@@ -586,7 +586,7 @@ final class TransactionBoundQueryContext(val transactionalContext: Transactional
 
   override def callReadOnlyProcedure(name: QualifiedProcedureName, args: Seq[Any], allowed: String) = {
     val revertable = transactionalContext.accessMode match {
-      case a: AuthSubject if a.hasRole(allowed) =>
+      case a: AuthSubject if a.allowsProcedureWith(allowed) =>
         Some(transactionalContext.restrictCurrentTransaction(AccessMode.Static.OVERRIDE_READ))
       case _ => None
     }
@@ -595,7 +595,7 @@ final class TransactionBoundQueryContext(val transactionalContext: Transactional
 
   override def callReadWriteProcedure(name: QualifiedProcedureName, args: Seq[Any], allowed: String) = {
     val revertable = transactionalContext.accessMode match {
-      case a: AuthSubject if a.hasRole(allowed) =>
+      case a: AuthSubject if a.allowsProcedureWith(allowed) =>
         Some(transactionalContext.restrictCurrentTransaction(AccessMode.Static.OVERRIDE_WRITE))
       case _ => None
     }
@@ -606,7 +606,7 @@ final class TransactionBoundQueryContext(val transactionalContext: Transactional
 
   override def callSchemaWriteProcedure(name: QualifiedProcedureName, args: Seq[Any], allowed: String) = {
     val revertable = transactionalContext.accessMode match {
-      case a: AuthSubject if a.hasRole(allowed) =>
+      case a: AuthSubject if a.allowsProcedureWith(allowed) =>
         Some(transactionalContext.restrictCurrentTransaction(AccessMode.Static.OVERRIDE_SCHEMA))
       case _ => None
     }

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/security/AuthSubject.java b/community/kernel/src/main/java/org/neo4j/kernel/api/security/AuthSubject.java
@@ -39,7 +39,13 @@ public interface AuthSubject extends AccessMode
      */
     void setPassword( String password ) throws IOException, InvalidArgumentsException;
 
-    boolean hasRole( String roleName ) throws InvalidArgumentsException;
+    /**
+     * Determines whether this subject is allowed to execute a procedure with the parameter string in its procedure annotation.
+     * @param roleName
+     * @return
+     * @throws InvalidArgumentsException
+     */
+    boolean allowsProcedureWith( String roleName ) throws InvalidArgumentsException;
 
     /**
      * Implementation to use when authentication has not yet been performed. Allows nothing.
@@ -64,7 +70,7 @@ public void setPassword( String password ) throws IOException, InvalidArgumentsE
         }
 
         @Override
-        public boolean hasRole( String roleName )
+        public boolean allowsProcedureWith( String roleName )
         {
             return false;
         }
@@ -164,7 +170,7 @@ public void setPassword( String password ) throws IOException, InvalidArgumentsE
         }
 
         @Override
-        public boolean hasRole( String roleName )
+        public boolean allowsProcedureWith( String roleName )
         {
             return true;
         }

diff --git a/community/security/src/main/java/org/neo4j/server/security/auth/BasicAuthSubject.java b/community/security/src/main/java/org/neo4j/server/security/auth/BasicAuthSubject.java
@@ -98,7 +98,7 @@ public void setPassword( String password ) throws IOException, InvalidArgumentsE
     }
 
     @Override
-    public boolean hasRole( String roleName )
+    public boolean allowsProcedureWith( String roleName )
     {
         return false;
     }

diff --git a/...curity/src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseAuthSubject.java b/...curity/src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseAuthSubject.java
@@ -76,7 +76,7 @@ public void setPassword( String password ) throws IOException, InvalidArgumentsE
     }
 
     @Override
-    public boolean hasRole( String roleName ) throws InvalidArgumentsException
+    public boolean allowsProcedureWith( String roleName ) throws InvalidArgumentsException
     {
         return getUserManager().getRoleNamesForUser( name() ).contains( roleName );
     }