fix: missing create(...) E_PERMs

rdaum · Feb 23, 2025 · 463c348 · 463c348
1 parent 376d105
commit 463c348
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 53 deletions.
diff --git a/crates/db/src/db_worldstate.rs b/crates/db/src/db_worldstate.rs
@@ -171,18 +171,14 @@ impl<TX: WorldStateTransaction> WorldState for DbTxWorldState<TX> {
         owner: &Obj,
         flags: BitEnum<ObjFlag>,
     ) -> Result<Obj, WorldStateError> {
-        /*
-           if ((valid(parent) ? !db_object_allows(parent, progr, FLAG_FERTILE)
-                              : (parent != NOTHING)) || (owner != progr && !is_wizard(progr)))
-               return make_error_pack(E_PERM);
-
-           bool pe;
-           if (valid(parent)) {
-               pe = !db_object_allows(parent, progr, FLAG_FERTILE)
-           } else {
-               pe = (parent != NOTHING)) || (owner != progr && !is_wizard(progr)))
-           }
-        */
+        let is_wizard = self.perms(perms)?.check_is_wizard()?;
+        if !self.valid(parent)? && (!parent.is_nothing() || (owner != perms && !is_wizard)) {
+            return Err(WorldStateError::ObjectPermissionDenied);
+        }
+
+        if !is_wizard && owner != perms {
+            return Err(WorldStateError::ObjectPermissionDenied);
+        }
 
         self.check_parent(perms, parent, owner)?;
 

diff --git a/crates/kernel/testsuite/moot/translate.awk b/crates/kernel/testsuite/moot/translate.awk
diff --git a/crates/kernel/testsuite/moot_suite.rs b/crates/kernel/testsuite/moot_suite.rs
@@ -164,5 +164,5 @@ fn test(db: Box<dyn Database>, path: &Path) {
 fn test_single() {
     // cargo test -p moor-kernel --test moot-suite test_single -- --ignored
     // CARGO_PROFILE_RELEASE_DEBUG=true cargo flamegraph --test moot-suite -- test_single --ignored
-    test_with_db(&testsuite_dir().join("moot/objects/test_create.moot"));
+    test_with_db(&testsuite_dir().join("moot/objects/test_create_errors.moot"));
 }