feat(permission): update

Author: kt3k

cli/flags.rs

@@ -54,7 +54,6 @@ pub struct DenoFlags {
   pub allow_env: bool,
   pub allow_run: bool,
   pub allow_hrtime: bool,
-  pub no_prompts: bool,
   pub no_fetch: bool,
   pub seed: Option<u64>,
   pub v8_flags: Option<Vec<String>>,
@@ -118,11 +117,6 @@ fn add_run_args<'a, 'b>(app: App<'a, 'b>) -> App<'a, 'b> {
         .long("allow-all")
         .help("Allow all permissions"),
     )
-    .arg(
-      Arg::with_name("no-prompt")
-        .long("no-prompt")
-        .help("Do not use prompts"),
-    )
     .arg(
       Arg::with_name("no-fetch")
         .long("no-fetch")
@@ -707,9 +701,6 @@ fn parse_run_args(mut flags: DenoFlags, matches: &ArgMatches) -> DenoFlags {
     flags.allow_write = true;
     flags.allow_hrtime = true;
   }
-  if matches.is_present("no-prompt") {
-    flags.no_prompts = true;
-  }
   if matches.is_present("no-fetch") {
     flags.no_fetch = true;
   }

cli/js/permissions.ts

@@ -1,7 +1,6 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
 import * as dispatch from "./dispatch.ts";
 import { sendSync } from "./dispatch_json.ts";
-import * as eventTarget from "./event_target.ts";
 
 /** Permissions as granted by the caller
  * See: https://w3c.github.io/permissions/#permission-registry
@@ -21,47 +20,43 @@ export type PermissionState = "granted" | "denied" | "prompt";
 /** See: https://w3c.github.io/permissions/#permission-descriptor */
 interface PermissionDescriptor {
   name: PermissionName;
+  url?: string;
+  path?: string;
 }
 
 export class Permissions {
   /**
    */
   async query(desc: PermissionDescriptor): Promise<PermissionStatus> {
-    const { state } = await sendSync(dispatch.OP_QUERY_PERMISSION, {
-      name: desc.name
+    const { state } = sendSync(dispatch.OP_QUERY_PERMISSION, {
+      ...desc
     });
-    return new PermissionStatus(desc, state);
+    return new PermissionStatus(state);
   }
 
   /**
    */
   async revoke(desc: PermissionDescriptor): Promise<PermissionStatus> {
-    const { state } = await sendSync(dispatch.OP_REVOKE_PERMISSION, {
-      name: desc.name
+    const { state } = sendSync(dispatch.OP_REVOKE_PERMISSION, {
+      ...desc
     });
-    return new PermissionStatus(desc, state);
+    return new PermissionStatus(state);
   }
 
   /**
    */
   async request(desc: PermissionDescriptor): Promise<PermissionStatus> {
-    const { state } = await sendSync(dispatch.OP_REQUEST_PERMISSION, {
-      name: desc.name
+    const { state } = sendSync(dispatch.OP_REQUEST_PERMISSION, {
+      ...desc
     });
-    return new PermissionStatus(desc, state);
+    return new PermissionStatus(state);
   }
 }
 
 export const permissions = new Permissions();
 
 /** https://w3c.github.io/permissions/#permissionstatus */
-export class PermissionStatus extends eventTarget.EventTarget {
-  private _desc: PermissionDescriptor;
-  state: PermissionState;
-  constructor(desc: PermissionDescriptor, state: PermissionState) {
-    super();
-    this._desc = desc;
-    this.state = state;
-  }
+export class PermissionStatus {
+  constructor(public state: PermissionState) {}
   // TODO(kt3k): implement onchange handler
 }

cli/ops/permissions.rs

@@ -1,6 +1,7 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
 use super::dispatch_json::{Deserialize, JsonOp, Value};
 use crate::ops::json_op;
+use crate::permissions;
 use crate::state::ThreadSafeState;
 use deno::*;
 
@@ -19,37 +20,40 @@ pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
   );
 }
 
-pub fn op_permissions(
-  state: &ThreadSafeState,
-  _args: Value,
-  _zero_copy: Option<PinnedBuf>,
-) -> Result<JsonOp, ErrBox> {
-  Ok(JsonOp::Sync(json!({
-    "run": state.permissions.allows_run(),
-    "read": state.permissions.allows_read(),
-    "write": state.permissions.allows_write(),
-    "net": state.permissions.allows_net(),
-    "env": state.permissions.allows_env(),
-    "hrtime": state.permissions.allows_hrtime(),
-  })))
-}
-
 #[derive(Deserialize)]
 struct PermissionArgs {
   name: String,
   url: Option<String>,
   path: Option<String>,
 }
 
+fn get_current_permission(
+  state: &ThreadSafeState,
+  args: &PermissionArgs,
+) -> Result<permissions::PermissionAccessorState, ErrBox> {
+  Ok(
+    state
+      .permissions
+      .get_permission_state(&args.name, &args.path, &args.url)?,
+  )
+}
+
+fn permission_state_to_json_op(
+  state: permissions::PermissionAccessorState,
+) -> JsonOp {
+  JsonOp::Sync(json!({
+    "state": state.to_string()
+  }))
+}
+
 pub fn op_query_permission(
   state: &ThreadSafeState,
   args: Value,
   _zero_copy: Option<PinnedBuf>,
 ) -> Result<JsonOp, ErrBox> {
   let args: PermissionArgs = serde_json::from_value(args)?;
-  Ok(JsonOp::Sync(json!({
-    "state": state.permissions.get_permission_string(args.name)?
-  })))
+  let perm = get_current_permission(state, &args)?;
+  Ok(permission_state_to_json_op(perm))
 }
 
 pub fn op_request_permission(
@@ -58,19 +62,26 @@ pub fn op_request_permission(
   _zero_copy: Option<PinnedBuf>,
 ) -> Result<JsonOp, ErrBox> {
   let args: PermissionArgs = serde_json::from_value(value)?;
+  let path = args.path.as_ref();
+  let url = args.url.as_ref();
   let name = args.name.as_ref();
+  let perm = get_current_permission(state, &args)?;
+  if perm != permissions::PermissionAccessorState::Ask {
+    return Ok(permission_state_to_json_op(perm));
+  }
+
   match name {
     "run" => state.permissions.request_run(),
-    "read" => state.permissions.request_read(args.path.unwrap().as_ref()),
-    "write" => state.permissions.request_write(args.path.unwrap().as_ref()),
-    "net" => state.permissions.request_net(args.url.unwrap().as_ref()),
+    "read" => state.permissions.request_read(path.unwrap().as_ref()),
+    "write" => state.permissions.request_write(path.unwrap().as_ref()),
+    "net" => state.permissions.request_net(url.unwrap().as_ref()),
     "env" => state.permissions.request_env(),
     "hrtime" => state.permissions.request_hrtime(),
     _ => Ok(()),
   }?;
-  Ok(JsonOp::Sync(json!({
-    "state": state.permissions.get_permission_string(args.name)?
-  })))
+
+  let perm1 = get_current_permission(state, &args)?;
+  Ok(permission_state_to_json_op(perm1))
 }
 
 pub fn op_revoke_permission(
@@ -86,9 +97,9 @@ pub fn op_revoke_permission(
     "net" => state.permissions.revoke_net(),
     "env" => state.permissions.revoke_env(),
     "hrtime" => state.permissions.revoke_hrtime(),
-    _ => Ok(()),
-  }?;
-  Ok(JsonOp::Sync(json!({
-    "state": state.permissions.get_permission_string(args.name)?
-  })))
+    _ => {}
+  };
+
+  let perm = get_current_permission(state, &args)?;
+  Ok(permission_state_to_json_op(perm))
 }