[MOD] XQuery: Permissions of standard functions. Closes #2384

ChristianGruen · ChristianGruen · commit 2c031c4f884b · 2025-03-06T12:05:34.000+01:00
diff --git a/basex-core/src/main/java/org/basex/query/QueryError.java b/basex-core/src/main/java/org/basex/query/QueryError.java
@@ -57,8 +57,6 @@ public enum QueryError {
   /** Error code. */
   BASEX_OVERFLOW(BASEX, "overflow", "Stack Overflow: Try tail recursion?"),
   /** Error code. */
-  BASEX_PERMISSION_X(BASEX, "permission", "No % permission."),
-  /** Error code. */
   BASEX_PERMISSION_X_X(BASEX, "permission", "No % permission: %."),
   /** Error code. */
   BASEX_RESTXQ_X(BASEX, "restxq", "%"),
diff --git a/basex-core/src/main/java/org/basex/query/QueryResources.java b/basex-core/src/main/java/org/basex/query/QueryResources.java
@@ -171,12 +171,13 @@ public synchronized void addFunctions(final String path, final Value funcs) {
    * Opens a new database or returns a reference to an already opened database.
    * @param name name of database
    * @param user current user
+   * @param updating updating access
    * @param info input info (can be {@code null})
    * @return database instance
    * @throws QueryException query exception
    */
-  public synchronized Data database(final String name, final User user, final InputInfo info)
-      throws QueryException {
+  public synchronized Data database(final String name, final User user, final boolean updating,
+      final InputInfo info) throws QueryException {
 
     final boolean mainmem = context.options.get(MainOptions.MAINMEM);
 
@@ -188,7 +189,8 @@ public synchronized Data database(final String name, final User user, final Inpu
     }
 
     // open and register database
-    if(!user.has(Perm.READ, name)) throw BASEX_PERMISSION_X_X.get(info, Perm.READ, name);
+    final Perm perm = updating ? Perm.WRITE : Perm.READ;
+    if(!user.has(perm, name)) throw BASEX_PERMISSION_X_X.get(info, perm, name);
     try {
       return addData(Open.open(name, context, context.options, true, false));
     } catch(final IOException ex) {
diff --git a/basex-core/src/main/java/org/basex/query/expr/ParseExpr.java b/basex-core/src/main/java/org/basex/query/expr/ParseExpr.java
@@ -6,6 +6,7 @@
 
 import java.util.*;
 
+import org.basex.core.users.*;
 import org.basex.data.*;
 import org.basex.query.*;
 import org.basex.query.ann.*;
@@ -214,6 +215,29 @@ protected final void checkAllUp(final Expr... exprs) throws QueryException {
     }
   }
 
+  /**
+   * Checks if the current user has the given permissions. If negative, an exception is thrown.
+   * @param qc query context
+   * @param perm permission
+   * @throws QueryException query exception
+   */
+  protected void checkPerm(final QueryContext qc, final Perm perm) throws QueryException {
+    if(!qc.user.has(perm)) throw BASEX_PERMISSION_X_X.get(info, perm, this);
+  }
+
+  /**
+   * Checks if the current user has the given permissions for the specified database.
+   * If negative, an exception is thrown.
+   * @param qc query context
+   * @param perm permission
+   * @param name name of resource
+   * @throws QueryException query exception
+   */
+  protected void checkPerm(final QueryContext qc, final Perm perm, final String name)
+      throws QueryException {
+    if(!qc.user.has(perm, name)) throw BASEX_PERMISSION_X_X.get(info(), perm, this);
+  }
+
   /**
    * Returns the current context value or throws an exception if the context value is not set.
    * @param qc query context
diff --git a/basex-core/src/main/java/org/basex/query/func/Function.java b/basex-core/src/main/java/org/basex/query/func/Function.java
@@ -542,7 +542,7 @@ ARRAY_ZM, flag(HOF)),
       params(QNAME_ZO), NCNAME_ZO),
   /** XQuery function. */
   PUT(FnPut::new, "put(node,source[,options])",
-      params(NODE_O, STRING_ZO, ITEM_ZO), EMPTY_SEQUENCE_Z, flag(UPD), FN_URI, Perm.CREATE),
+      params(NODE_O, STRING_ZO, ITEM_ZO), EMPTY_SEQUENCE_Z, flag(UPD), FN_URI, Perm.ADMIN),
   /** XQuery function. */
   QNAME(FnQName::new, "QName(uri,qname)",
       params(STRING_ZO, STRING_O), QNAME_O),
@@ -1245,7 +1245,7 @@ ANY_URI_O, flag(NDT), CLIENT_URI, Perm.CREATE),
       params(STRING_O, STRING_O), BOOLEAN_O, flag(NDT), DB_URI),
   /** XQuery function. */
   _DB_EXPORT(DbExport::new, "export(database,path[,param])",
-      params(STRING_O, STRING_O, ITEM_O), EMPTY_SEQUENCE_Z, flag(NDT), DB_URI, Perm.CREATE),
+      params(STRING_O, STRING_O, ITEM_O), EMPTY_SEQUENCE_Z, flag(NDT), DB_URI, Perm.ADMIN),
   /** XQuery function. */
   _DB_FLUSH(DbFlush::new, "flush(database)",
       params(ITEM_O), EMPTY_SEQUENCE_Z, flag(UPD), DB_URI),
diff --git a/basex-core/src/main/java/org/basex/query/func/StandardFunc.java b/basex-core/src/main/java/org/basex/query/func/StandardFunc.java
@@ -647,17 +647,7 @@ protected final HashMap<String, Value> toBindings(final Expr expr, final QueryCo
   protected final Data toData(final QueryContext qc) throws QueryException {
     final Data data = exprType.data();
     return data != null ? data : qc.resources.database(
-        toName(arg(0), false, DB_NAME_X, qc), qc.user, info);
-  }
-
-  /**
-   * Checks if the current user has given permissions. If negative, an exception is thrown.
-   * @param qc query context
-   * @param perm permission
-   * @throws QueryException query exception
-   */
-  protected void checkPerm(final QueryContext qc, final Perm perm) throws QueryException {
-    if(perm != Perm.NONE && !qc.user.has(perm)) throw BASEX_PERMISSION_X_X.get(info, perm, this);
+        toName(arg(0), false, DB_NAME_X, qc), qc.user, definition.has(Flag.UPD), info);
   }
 
   /**
diff --git a/basex-core/src/main/java/org/basex/query/func/db/DbAlterBackup.java b/basex-core/src/main/java/org/basex/query/func/db/DbAlterBackup.java
@@ -2,6 +2,7 @@
 
 import static org.basex.query.QueryError.*;
 
+import org.basex.core.users.*;
 import org.basex.query.*;
 import org.basex.query.up.*;
 import org.basex.query.up.primitives.name.*;
@@ -23,6 +24,7 @@ public Item item(final QueryContext qc, final InputInfo ii) throws QueryExceptio
     final String name = toName(arg(0), false, qc), newname = toName(arg(1), false, qc);
     if(name.equals(newname)) throw DB_CONFLICT4_X.get(info, name, newname);
 
+    checkPerm(qc, Perm.CREATE, name);
     final StringList backups = qc.context.databases.backups(name);
     if(backups.isEmpty()) throw DB_NOBACKUP_X.get(info, name);
 
diff --git a/basex-core/src/main/java/org/basex/query/func/db/DbCopy.java b/basex-core/src/main/java/org/basex/query/func/db/DbCopy.java
@@ -2,6 +2,7 @@
 
 import static org.basex.query.QueryError.*;
 
+import org.basex.core.users.*;
 import org.basex.query.*;
 import org.basex.query.up.primitives.name.*;
 import org.basex.query.util.*;
@@ -33,6 +34,7 @@ final void copy(final QueryContext qc, final boolean keep) throws QueryException
     if(name.equals(newname)) throw DB_CONFLICT4_X.get(info, name, newname);
 
     // source database does not exist
+    checkPerm(qc, Perm.CREATE, name);
     if(!qc.context.soptions.dbExists(name)) throw DB_OPEN1_X.get(info, name);
 
     qc.updates().add(keep ? new DBCopy(name, newname, qc, info) :
diff --git a/basex-core/src/main/java/org/basex/query/func/db/DbCreate.java b/basex-core/src/main/java/org/basex/query/func/db/DbCreate.java
@@ -4,6 +4,7 @@
 
 import java.util.*;
 
+import org.basex.core.users.*;
 import org.basex.query.*;
 import org.basex.query.iter.*;
 import org.basex.query.up.primitives.*;
@@ -24,6 +25,7 @@ public final class DbCreate extends DbNew {
   @Override
   public Item item(final QueryContext qc, final InputInfo ii) throws QueryException {
     final String name = toName(arg(0), false, qc);
+    checkPerm(qc, Perm.CREATE, name);
 
     final StringList paths = new StringList();
     final Iter iter = arg(2).iter(qc);
diff --git a/basex-core/src/main/java/org/basex/query/func/db/DbCreateBackup.java b/basex-core/src/main/java/org/basex/query/func/db/DbCreateBackup.java
@@ -2,6 +2,7 @@
 
 import static org.basex.query.QueryError.*;
 
+import org.basex.core.users.*;
 import org.basex.query.*;
 import org.basex.query.up.primitives.name.*;
 import org.basex.query.value.item.*;
@@ -19,6 +20,8 @@ public final class DbCreateBackup extends BackupFn {
   public Item item(final QueryContext qc, final InputInfo ii) throws QueryException {
     final String name = toName(arg(0), true, qc);
     final CreateBackupOptions options = toOptions(arg(1), new CreateBackupOptions(), qc);
+
+    checkPerm(qc, Perm.CREATE, name);
     if(!name.isEmpty() && !qc.context.soptions.dbExists(name)) throw DB_OPEN1_X.get(info, name);
 
     final String comment = options.get(CreateBackupOptions.COMMENT);
diff --git a/basex-core/src/main/java/org/basex/query/func/db/DbDrop.java b/basex-core/src/main/java/org/basex/query/func/db/DbDrop.java
@@ -2,6 +2,7 @@
 
 import static org.basex.query.QueryError.*;
 
+import org.basex.core.users.*;
 import org.basex.query.*;
 import org.basex.query.up.primitives.name.*;
 import org.basex.query.value.item.*;
@@ -18,7 +19,10 @@ public final class DbDrop extends DbAccessFn {
   @Override
   public Item item(final QueryContext qc, final InputInfo ii) throws QueryException {
     final String name = toName(arg(0), false, qc);
+
+    checkPerm(qc, Perm.CREATE, name);
     if(!qc.context.soptions.dbExists(name)) throw DB_OPEN1_X.get(info, name);
+
     qc.updates().add(new DBDrop(name, qc, info), qc);
     return Empty.VALUE;
   }
diff --git a/basex-core/src/main/java/org/basex/query/func/db/DbDropBackup.java b/basex-core/src/main/java/org/basex/query/func/db/DbDropBackup.java
@@ -2,6 +2,7 @@
 
 import static org.basex.query.QueryError.*;
 
+import org.basex.core.users.*;
 import org.basex.query.*;
 import org.basex.query.up.*;
 import org.basex.query.up.primitives.name.*;
@@ -21,11 +22,14 @@ public final class DbDropBackup extends BackupFn {
   public Item item(final QueryContext qc, final InputInfo ii) throws QueryException {
     final String name = toName(arg(0), true, qc);
 
+    checkPerm(qc, Perm.CREATE, name);
     final StringList backups = qc.context.databases.backups(name);
     if(backups.isEmpty()) throw DB_NOBACKUP_X.get(info, name);
 
     final Updates updates = qc.updates();
-    for(final String backup : backups) updates.add(new BackupDrop(backup, qc, info), qc);
+    for(final String backup : backups) {
+      updates.add(new BackupDrop(backup, qc, info), qc);
+    }
     return Empty.VALUE;
   }
 }
diff --git a/basex-core/src/main/java/org/basex/query/func/db/DbRestore.java b/basex-core/src/main/java/org/basex/query/func/db/DbRestore.java
@@ -3,6 +3,7 @@
 import static org.basex.query.QueryError.*;
 
 import org.basex.core.*;
+import org.basex.core.users.*;
 import org.basex.query.*;
 import org.basex.query.up.primitives.name.*;
 import org.basex.query.value.item.*;
@@ -23,6 +24,7 @@ public Item item(final QueryContext qc, final InputInfo ii) throws QueryExceptio
     final String name = toName(arg(0), true, qc);
 
     // find backup with or without date suffix
+    checkPerm(qc, Perm.CREATE, Databases.name(name));
     final StringList backups = qc.context.databases.backups(name);
     if(backups.isEmpty()) throw DB_NOBACKUP_X.get(info, name);
 
diff --git a/basex-core/src/main/java/org/basex/query/func/xquery/XQueryEval.java b/basex-core/src/main/java/org/basex/query/func/xquery/XQueryEval.java
@@ -140,8 +140,7 @@ public void run() {
       } catch(final QueryException ex) {
         Util.debug(ex);
         final QueryError error = ex.error();
-        final QueryException qe = error(ex, error == BASEX_PERMISSION_X ||
-            error == BASEX_PERMISSION_X_X ? XQUERY_PERM_X : null);
+        final QueryException qe = error(ex, error == BASEX_PERMISSION_X_X ? XQUERY_PERM_X : null);
         // pass on error info: assign (possibly empty) path of module which caused the error
         InputInfo ii = ex.info();
         if(pass && ii == null) ii = new InputInfo(query.path(), 1, 1);
diff --git a/basex-core/src/main/java/org/basex/query/up/DatabaseModifier.java b/basex-core/src/main/java/org/basex/query/up/DatabaseModifier.java
@@ -1,16 +1,9 @@
 package org.basex.query.up;
 
-import static org.basex.query.QueryError.*;
-
-import org.basex.core.users.*;
 import org.basex.data.*;
-import org.basex.query.*;
-import org.basex.query.up.primitives.*;
-import org.basex.query.up.primitives.name.*;
 
 /**
  * The database modifier holds all database updates during a snapshot.
- * Database permissions are checked to ensure that a user has enough privileges.
  *
  * @author BaseX Team, BSD License
  * @author Lukas Kircher
@@ -20,17 +13,4 @@ final class DatabaseModifier extends ContextModifier {
   public void addData(final Data data) {
     // ignore data
   }
-
-  @Override
-  synchronized void add(final Update update, final QueryContext qc) throws QueryException {
-    // check permissions
-    if(update instanceof NameUpdate) {
-      if(!qc.user.has(Perm.CREATE, ((NameUpdate) update).name()))
-        throw BASEX_PERMISSION_X.get(update.info(), Perm.CREATE);
-    } else if(update instanceof DataUpdate) {
-      if(!qc.user.has(Perm.WRITE, ((DataUpdate) update).data().meta.name))
-        throw BASEX_PERMISSION_X.get(update.info(), Perm.WRITE);
-    }
-    super.add(update, qc);
-  }
 }
diff --git a/basex-core/src/main/java/org/basex/query/up/expr/Delete.java b/basex-core/src/main/java/org/basex/query/up/expr/Delete.java
@@ -3,6 +3,7 @@
 import static org.basex.query.QueryError.*;
 import static org.basex.query.QueryText.*;
 
+import org.basex.core.users.*;
 import org.basex.query.*;
 import org.basex.query.expr.*;
 import org.basex.query.iter.*;
@@ -40,8 +41,9 @@ public Item item(final QueryContext qc, final InputInfo ii) throws QueryExceptio
       // nodes without parents are ignored
       if(node.parent() == null) continue;
       final Updates updates = qc.updates();
-      final DBNode dbn = updates.determineDataRef(node, qc);
-      updates.add(new DeleteNode(dbn.pre(), dbn.data(), info), qc);
+      final DBNode dbnode = updates.determineDataRef(node, qc);
+      checkPerm(qc, Perm.WRITE, dbnode.data().meta.name);
+      updates.add(new DeleteNode(dbnode.pre(), dbnode.data(), info), qc);
     }
     return Empty.VALUE;
   }
diff --git a/basex-core/src/main/java/org/basex/query/up/expr/Insert.java b/basex-core/src/main/java/org/basex/query/up/expr/Insert.java
@@ -2,6 +2,7 @@
 
 import static org.basex.query.QueryError.*;
 
+import org.basex.core.users.*;
 import org.basex.query.*;
 import org.basex.query.expr.*;
 import org.basex.query.iter.*;
@@ -79,6 +80,7 @@ public Item item(final QueryContext qc, final InputInfo ii) throws QueryExceptio
           throw (sibling ? UPATTELM_X : UPATTELM2_X).get(info, target);
 
         dbnode = updates.determineDataRef(target, qc);
+        checkPerm(qc, Perm.WRITE, dbnode.data().meta.name);
         up = new InsertAttribute(dbnode.pre(), dbnode.data(), info, checkNS(list, target));
         updates.add(up, qc);
       }
@@ -87,6 +89,7 @@ public Item item(final QueryContext qc, final InputInfo ii) throws QueryExceptio
       list = builder.children;
       if(list != null) {
         dbnode = updates.determineDataRef(node, qc);
+        checkPerm(qc, Perm.WRITE, dbnode.data().meta.name);
         switch(mode) {
           case BEFORE: up = new InsertBefore(dbnode.pre(), dbnode.data(), info, list); break;
           case AFTER : up = new InsertAfter(dbnode.pre(), dbnode.data(), info, list); break;
diff --git a/basex-core/src/main/java/org/basex/query/up/expr/Rename.java b/basex-core/src/main/java/org/basex/query/up/expr/Rename.java
@@ -6,6 +6,7 @@
 
 import java.util.*;
 
+import org.basex.core.users.*;
 import org.basex.query.*;
 import org.basex.query.expr.*;
 import org.basex.query.expr.constr.*;
@@ -79,8 +80,9 @@ public Item item(final QueryContext qc, final InputInfo ii) throws QueryExceptio
       }
 
       final Updates updates = qc.updates();
-      final DBNode dbn = updates.determineDataRef(target, qc);
-      updates.add(new RenameNode(dbn.pre(), dbn.data(), info, newName), qc);
+      final DBNode dbnode = updates.determineDataRef(target, qc);
+      checkPerm(qc, Perm.WRITE, dbnode.data().meta.name);
+      updates.add(new RenameNode(dbnode.pre(), dbnode.data(), info, newName), qc);
     }
     return Empty.VALUE;
   }
diff --git a/basex-core/src/main/java/org/basex/query/up/expr/Replace.java b/basex-core/src/main/java/org/basex/query/up/expr/Replace.java
@@ -3,6 +3,7 @@
 import static org.basex.query.QueryError.*;
 import static org.basex.query.QueryText.*;
 
+import org.basex.core.users.*;
 import org.basex.query.*;
 import org.basex.query.expr.*;
 import org.basex.query.iter.*;
@@ -51,7 +52,8 @@ public Item item(final QueryContext qc, final InputInfo ii) throws QueryExceptio
 
       final ANode targ = (ANode) item;
       final Updates updates = qc.updates();
-      final DBNode dbn = updates.determineDataRef(targ, qc);
+      final DBNode dbnode = updates.determineDataRef(targ, qc);
+      checkPerm(qc, Perm.WRITE, dbnode.data().meta.name);
 
       // replace node
       if(builder == null) builder = builder(arg(1), qc);
@@ -65,7 +67,7 @@ public Item item(final QueryContext qc, final InputInfo ii) throws QueryExceptio
         if(type == NodeType.COMMENT) FComm.parse(text, info);
         if(type == NodeType.PROCESSING_INSTRUCTION) FPI.parse(text, info);
 
-        updates.add(new ReplaceValue(dbn.pre(), dbn.data(), info, text), qc);
+        updates.add(new ReplaceValue(dbnode.pre(), dbnode.data(), info, text), qc);
       } else {
         final ANode parent = targ.parent();
         if(parent == null) throw UPNOPAR_X.get(info, targ);
@@ -81,7 +83,7 @@ public Item item(final QueryContext qc, final InputInfo ii) throws QueryExceptio
           list = builder.children != null ? builder.children : new ANodeList();
         }
         // conforms to specification: insertion sequence may be empty
-        updates.add(new ReplaceNode(dbn.pre(), dbn.data(), info, list), qc);
+        updates.add(new ReplaceNode(dbnode.pre(), dbnode.data(), info, list), qc);
       }
     }
     return Empty.VALUE;
diff --git a/basex-core/src/test/java/org/basex/core/PermissionTest.java b/basex-core/src/test/java/org/basex/core/PermissionTest.java
diff --git a/basex-core/src/test/java/org/basex/core/locks/CommandLockingTest.java b/basex-core/src/test/java/org/basex/core/locks/CommandLockingTest.java
