permit -> grant

Signed-off-by: Scott Andrews <scott@andrews.me>

Author: scothis

Cargo.lock

@@ -53,18 +53,18 @@ $(foreach component,$(TEST_COMPONENTS),$(eval $(call TEST_COMPONENT,$(component)
 lib/tests/logging-to-stdout.wasm:
 	wkg oci pull ghcr.io/componentized/logging/to-stdout:v0.2.1 -o "lib/tests/logging-to-stdout.wasm"
 
-lib/tests/permit.wasm: lib/gate.wasm lib/latch-permit-all.wasm
+lib/tests/grant.wasm: lib/gate.wasm lib/latch-grant-all.wasm
 	wac plug lib/gate.wasm \
-		--plug lib/latch-permit-all.wasm \
-		-o lib/tests/permit.wasm
+		--plug lib/latch-grant-all.wasm \
+		-o lib/tests/grant.wasm
 
-lib/tests/filesystem-cli-permit.wasm: lib/tests/filesystem-cli.wasm lib/tests/permit.wasm lib/tests/logging-to-stdout.wasm
+lib/tests/filesystem-cli-grant.wasm: lib/tests/filesystem-cli.wasm lib/tests/grant.wasm lib/tests/logging-to-stdout.wasm
 	wac plug lib/tests/filesystem-cli.wasm \
 		--plug <( \
-			wac plug lib/tests/permit.wasm \
+			wac plug lib/tests/grant.wasm \
 				--plug lib/tests/logging-to-stdout.wasm \
 		) \
-		-o lib/tests/filesystem-cli-permit.wasm
+		-o lib/tests/filesystem-cli-grant.wasm
 
 lib/tests/deny.wasm: lib/gate.wasm lib/latch-deny-all.wasm
 	wac plug lib/gate.wasm \
@@ -79,7 +79,7 @@ lib/tests/filesystem-cli-deny.wasm: lib/tests/filesystem-cli.wasm lib/tests/deny
 		) \
 		-o lib/tests/filesystem-cli-deny.wasm
 
-lib/tests/readonly.wasm: lib/gate.wasm lib/latch-n2.wasm lib/latch-readonly.wasm lib/latch-permit-all.wasm
+lib/tests/readonly.wasm: lib/gate.wasm lib/latch-n2.wasm lib/latch-readonly.wasm lib/latch-grant-all.wasm
 	wac plug lib/gate.wasm \
 		--plug lib/latch-readonly.wasm \
 		-o lib/tests/readonly.wasm
@@ -93,7 +93,7 @@ lib/tests/filesystem-cli-readonly.wasm: lib/tests/filesystem-cli.wasm lib/tests/
 		-o lib/tests/filesystem-cli-readonly.wasm
 
 .PHONY: tests
-tests: $(foreach component,$(TEST_COMPONENTS),lib/tests/$(component).wasm) lib/tests/filesystem-cli-permit.wasm lib/tests/filesystem-cli-deny.wasm lib/tests/filesystem-cli-readonly.wasm
+tests: $(foreach component,$(TEST_COMPONENTS),lib/tests/$(component).wasm) lib/tests/filesystem-cli-grant.wasm lib/tests/filesystem-cli-deny.wasm lib/tests/filesystem-cli-readonly.wasm
 
 .PHONY: wit
 wit: wit/deps

Makefile

@@ -20,7 +20,7 @@ A collection of utility components that remix wasi:filesystem types and interfac
 - [`latch-n3`](./components/latch-n3/)
 - [`latch-n4`](./components/latch-n4/)
 - [`latch-deny-all`](./components/latch-deny-all/)
-- [`latch-permit-all`](./components/latch-permit-all/)
+- [`latch-grant-all`](./components/latch-grant-all/)
 - [`latch-glob`](./components/latch-glob/)
 - [`latch-readonly`](./components/latch-readonly/)
 - ~~[`readonly`](./components/readonly/)~~ (deprecated, favor gate with readonly latch)

README.md

@@ -1,8 +1,8 @@
 # `latch-glob`
 
-Filesystem latch that uses glob patterns to permit or deny operations on a path.
+Filesystem latch that uses glob patterns to grant or deny operations on a path.
 
-The patterns are defined in a wasi:config/store. Keys starting with `deny` are parsed as globs with matching path operations being denied. Multiple patterns are allowed by defining unique config keys (e.g. `deny-1`, `deny-2`, etc). Keys starting with `permit` are parsed as globs with matching path operations being permitted.
+The patterns are defined in a wasi:config/store. Keys starting with `deny` are parsed as globs with matching path operations being denied. Multiple patterns are allowed by defining unique config keys (e.g. `deny-1`, `deny-2`, etc). Keys starting with `grant` are parsed as globs with matching path operations being granted.
 
 Operations are evaluated against the pattern with the base path for the operation joined with a relative path, if any. For example, the file descriptor open-at operation will join the descriptor's path with the argument's path, the resulting path is matched to the patterns.
 

components/latch-glob/README.md

@@ -17,7 +17,7 @@ struct GlobLatch {}
 struct Patterns {
     initialized: bool,
     denies: Option<Vec<Box<dyn PathMatcher>>>,
-    permits: Option<Vec<Box<dyn PathMatcher>>>,
+    grants: Option<Vec<Box<dyn PathMatcher>>>,
     deny_reason: Option<ErrorCode>,
 }
 
@@ -28,16 +28,16 @@ impl Patterns {
         }
 
         let mut denies: Vec<Box<dyn PathMatcher>> = vec![];
-        let mut permits: Vec<Box<dyn PathMatcher>> = vec![];
+        let mut grants: Vec<Box<dyn PathMatcher>> = vec![];
         let mut reason = ErrorCode::NotPermitted;
 
         for (key, value) in wasi::config::store::get_all().expect("config must be available") {
             if key.starts_with("deny") {
                 denies.push(Box::new(
                     glob(&value).expect("config value must parse as a glob"),
                 ));
-            } else if key.starts_with("permit") {
-                permits.push(Box::new(
+            } else if key.starts_with("grant") {
+                grants.push(Box::new(
                     glob(&value).expect("config value must parse as a glob"),
                 ));
             } else if key == "reason" {
@@ -47,7 +47,7 @@ impl Patterns {
 
         unsafe {
             STATE.denies = Some(denies);
-            STATE.permits = Some(permits);
+            STATE.grants = Some(grants);
             STATE.deny_reason = Some(reason);
             STATE.initialized = true;
         };
@@ -63,9 +63,9 @@ impl Patterns {
         for p in paths {
             let path = Path::new(&path).join(p);
             match unsafe { STATE.authorize_path(&path) } {
-                // return denies immediately, buffer permits
+                // return denies immediately, buffer grants
                 Some(Decision::Denied(reason)) => return Some(Decision::Denied(reason)),
-                Some(Decision::Permitted) => decision = Some(Decision::Permitted),
+                Some(Decision::Granted) => decision = Some(Decision::Granted),
                 None => {}
             }
         }
@@ -78,9 +78,9 @@ impl Patterns {
                 return Some(Decision::Denied(self.deny_reason.unwrap()));
             }
         }
-        for permit in self.permits.as_ref().unwrap() {
-            if permit.matches(path) {
-                return Some(Decision::Permitted);
+        for grant in self.grants.as_ref().unwrap() {
+            if grant.matches(path) {
+                return Some(Decision::Granted);
             }
         }
         None
@@ -90,7 +90,7 @@ impl Patterns {
 static mut STATE: Patterns = Patterns {
     initialized: false,
     denies: None,
-    permits: None,
+    grants: None,
     deny_reason: None,
 };
 

components/latch-glob/src/lib.rs

@@ -1,5 +1,5 @@
 [package]
-name = "latch-permit-all"
+name = "latch-grant-all"
 version = "0.1.0"
 edition = "2021"
 license = "Apache-2.0"

components/latch-permit-all/Cargo.toml components/latch-grant-all/Cargo.tomlcomponents/latch-permit-all/Cargo.toml renamed to components/latch-grant-all/Cargo.toml

@@ -0,0 +1,3 @@
+# `latch-grant-all`
+
+Filesystem latch that implicitly grants all operations.

components/latch-grant-all/README.md

@@ -2,11 +2,11 @@
 
 use crate::exports::componentized::filesystem::latch::{Decision, Guest as Latch, Operation};
 
-struct PermitAllLatch {}
+struct GrantAllLatch {}
 
-impl Latch for PermitAllLatch {
+impl Latch for GrantAllLatch {
     fn authorize(_: Operation) -> Option<Decision> {
-        Some(Decision::Permitted)
+        Some(Decision::Granted)
     }
 }
 
@@ -16,4 +16,4 @@ wit_bindgen::generate!({
     generate_all
 });
 
-export!(PermitAllLatch);
+export!(GrantAllLatch);

components/latch-permit-all/src/lib.rs components/latch-grant-all/src/lib.rscomponents/latch-permit-all/src/lib.rs renamed to components/latch-grant-all/src/lib.rs

@@ -21,7 +21,7 @@ pub fn authorize(
     for authorize in authorizers {
         match authorize(&operation) {
             None => {}
-            Some(latch::Decision::Permitted) => return Some(Decision::Permitted),
+            Some(latch::Decision::Granted) => return Some(Decision::Granted),
             Some(latch::Decision::Denied(error_code)) => return Some(Decision::Denied(error_code)),
         }
     }