summaryrefslogtreecommitdiff
path: root/cli/ops/permissions.rs
diff options
context:
space:
mode:
Diffstat (limited to 'cli/ops/permissions.rs')
-rw-r--r--cli/ops/permissions.rs45
1 files changed, 21 insertions, 24 deletions
diff --git a/cli/ops/permissions.rs b/cli/ops/permissions.rs
index 0f40b642c..bd8340bf0 100644
--- a/cli/ops/permissions.rs
+++ b/cli/ops/permissions.rs
@@ -33,7 +33,8 @@ pub fn op_query_permission(
_zero_copy: Option<PinnedBuf>,
) -> Result<JsonOp, ErrBox> {
let args: PermissionArgs = serde_json::from_value(args)?;
- let perm = state.permissions.get_permission_state(
+ let permissions = state.permissions.lock().unwrap();
+ let perm = permissions.get_permission_state(
&args.name,
&args.url.as_ref().map(String::as_str),
&args.path.as_ref().map(String::as_str),
@@ -47,16 +48,17 @@ pub fn op_revoke_permission(
_zero_copy: Option<PinnedBuf>,
) -> Result<JsonOp, ErrBox> {
let args: PermissionArgs = serde_json::from_value(args)?;
+ let mut permissions = state.permissions.lock().unwrap();
match args.name.as_ref() {
- "run" => state.permissions.allow_run.revoke(),
- "read" => state.permissions.allow_read.revoke(),
- "write" => state.permissions.allow_write.revoke(),
- "net" => state.permissions.allow_net.revoke(),
- "env" => state.permissions.allow_env.revoke(),
- "hrtime" => state.permissions.allow_hrtime.revoke(),
+ "run" => permissions.allow_run.revoke(),
+ "read" => permissions.allow_read.revoke(),
+ "write" => permissions.allow_write.revoke(),
+ "net" => permissions.allow_net.revoke(),
+ "env" => permissions.allow_env.revoke(),
+ "hrtime" => permissions.allow_hrtime.revoke(),
_ => {}
};
- let perm = state.permissions.get_permission_state(
+ let perm = permissions.get_permission_state(
&args.name,
&args.url.as_ref().map(String::as_str),
&args.path.as_ref().map(String::as_str),
@@ -70,23 +72,18 @@ pub fn op_request_permission(
_zero_copy: Option<PinnedBuf>,
) -> Result<JsonOp, ErrBox> {
let args: PermissionArgs = serde_json::from_value(args)?;
+ let mut permissions = state.permissions.lock().unwrap();
let perm = match args.name.as_ref() {
- "run" => Ok(state.permissions.request_run()),
- "read" => Ok(
- state
- .permissions
- .request_read(&args.path.as_ref().map(String::as_str)),
- ),
- "write" => Ok(
- state
- .permissions
- .request_write(&args.path.as_ref().map(String::as_str)),
- ),
- "net" => state
- .permissions
- .request_net(&args.url.as_ref().map(String::as_str)),
- "env" => Ok(state.permissions.request_env()),
- "hrtime" => Ok(state.permissions.request_hrtime()),
+ "run" => Ok(permissions.request_run()),
+ "read" => {
+ Ok(permissions.request_read(&args.path.as_ref().map(String::as_str)))
+ }
+ "write" => {
+ Ok(permissions.request_write(&args.path.as_ref().map(String::as_str)))
+ }
+ "net" => permissions.request_net(&args.url.as_ref().map(String::as_str)),
+ "env" => Ok(permissions.request_env()),
+ "hrtime" => Ok(permissions.request_hrtime()),
n => Err(type_error(format!("No such permission name: {}", n))),
}?;
Ok(JsonOp::Sync(json!({ "state": perm.to_string() })))