From de28e6fc09f30c05a38c257137ee8d15150cc1a6 Mon Sep 17 00:00:00 2001 From: Divy Srivastava Date: Tue, 12 Mar 2024 10:42:26 -0700 Subject: refactor: add `deno_permissions` crate (#22236) Issue https://github.com/denoland/deno/issues/22222 ![image](https://github.com/denoland/deno/assets/34997667/2af8474b-b919-4519-98ce-9d29bc7829f2) This PR moves `runtime/permissions` code to a upstream crate called `deno_permissions`. The `deno_permissions::PermissionsContainer` is put into the OpState and can be used instead of the current trait-based permissions system. For this PR, I've migrated `deno_fetch` to the new crate but kept the rest of the trait-based system as a wrapper of `deno_permissions` crate. Doing the migration all at once is error prone and hard to review. Comparing incremental compile times for `ext/fetch` on Mac M1: | profile | `cargo build --bin deno` | `cargo plonk build --bin deno` | | --------- | ------------- | ------------------- | | `debug` | 20 s | 0.8s | | `release` | 4 mins 12 s | 1.4s | --- cli/ops/bench.rs | 4 +++- cli/ops/testing.rs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'cli/ops') diff --git a/cli/ops/bench.rs b/cli/ops/bench.rs index 74002440f..2e704a49d 100644 --- a/cli/ops/bench.rs +++ b/cli/ops/bench.rs @@ -56,7 +56,7 @@ pub fn op_pledge_test_permissions( let token = Uuid::new_v4(); let parent_permissions = state.borrow_mut::(); let worker_permissions = { - let mut parent_permissions = parent_permissions.0.lock(); + let mut parent_permissions = parent_permissions.0 .0.lock(); let perms = create_child_permissions(&mut parent_permissions, args)?; PermissionsContainer::new(perms) }; @@ -69,6 +69,7 @@ pub fn op_pledge_test_permissions( state.put::(PermissionsHolder(token, parent_permissions)); // NOTE: This call overrides current permission set for the worker + state.put(worker_permissions.0.clone()); state.put::(worker_permissions); Ok(token) @@ -85,6 +86,7 @@ pub fn op_restore_test_permissions( } let permissions = permissions_holder.1; + state.put(permissions.0.clone()); state.put::(permissions); Ok(()) } else { diff --git a/cli/ops/testing.rs b/cli/ops/testing.rs index eb7cf71ce..6025b9917 100644 --- a/cli/ops/testing.rs +++ b/cli/ops/testing.rs @@ -57,7 +57,7 @@ pub fn op_pledge_test_permissions( let token = Uuid::new_v4(); let parent_permissions = state.borrow_mut::(); let worker_permissions = { - let mut parent_permissions = parent_permissions.0.lock(); + let mut parent_permissions = parent_permissions.0 .0.lock(); let perms = create_child_permissions(&mut parent_permissions, args)?; PermissionsContainer::new(perms) }; @@ -69,6 +69,7 @@ pub fn op_pledge_test_permissions( state.put::(PermissionsHolder(token, parent_permissions)); // NOTE: This call overrides current permission set for the worker + state.put(worker_permissions.0.clone()); state.put::(worker_permissions); Ok(token) @@ -85,6 +86,7 @@ pub fn op_restore_test_permissions( } let permissions = permissions_holder.1; + state.put(permissions.0.clone()); state.put::(permissions); Ok(()) } else { -- cgit v1.2.3