SecurityContext.allowExecuteAdminProcedure is changing in 4.3 to prov…

…ide more information than just true / false. Update to reflect this. I haven't done so, but it would be possible to use this to provide a better error message if this is desirable.
neo4j-contrib · Jun 11, 2021 · 8d49d87 · 8d49d87
1 parent 0a89345
commit 8d49d87
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/core/src/main/java/apoc/util/Util.java b/core/src/main/java/apoc/util/Util.java
@@ -659,8 +659,15 @@ public static void logErrors(String message, Map<String, Long> errors, Log log)
         }
     }
 
-    public static void checkAdmin(SecurityContext securityContext, ProcedureCallContext callContext, String procedureName) {
-        if (!securityContext.allowExecuteAdminProcedure(callContext.id())) throw new RuntimeException("This procedure "+ procedureName +" is only available to admin users");
+    public static void checkAdmin( SecurityContext securityContext, ProcedureCallContext callContext, String procedureName )
+    {
+        switch ( securityContext.allowExecuteAdminProcedure( callContext.id() ) )
+        {
+        case EXPLICIT_GRANT:
+            return;
+        default:
+            throw new RuntimeException( "This procedure " + procedureName + " is only available to admin users" );
+        }
     }
 
     public static void sleep(int millis) {