clean up

denoland · Aug 13, 2019 · 7f680d0 · 7f680d0
1 parent 0d64eef
commit 7f680d0
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 88 deletions.
diff --git a/cli/dyn_import.rs b/cli/dyn_import.rs
diff --git a/cli/main.rs b/cli/main.rs
@@ -22,7 +22,6 @@ pub mod deno_error;
 pub mod diagnostics;
 mod disk_cache;
 mod dispatch_minimal;
-mod dyn_import;
 mod file_fetcher;
 pub mod flags;
 pub mod fmt_errors;

diff --git a/cli/state.rs b/cli/state.rs
@@ -4,7 +4,6 @@ use crate::compilers::JsCompiler;
 use crate::compilers::JsonCompiler;
 use crate::compilers::TsCompiler;
 use crate::deno_dir;
-use crate::dyn_import;
 use crate::file_fetcher::SourceFileFetcher;
 use crate::flags;
 use crate::global_timer::GlobalTimer;
@@ -134,7 +133,7 @@ impl Loader for ThreadSafeState {
       ModuleSpecifier::resolve_import(specifier, referrer)?;
 
     if is_dyn_import {
-      dyn_import::check_permissions(self.clone(), &module_specifier)?;
+      self.check_dyn_import(&module_specifier)?;
     }
 
     Ok(module_specifier)
@@ -311,6 +310,30 @@ impl ThreadSafeState {
     self.permissions.check_run()
   }
 
+  pub fn check_dyn_import(
+    self: &Self,
+    module_specifier: &ModuleSpecifier,
+  ) -> Result<(), ErrBox> {
+    let u = module_specifier.as_url();
+    match u.scheme() {
+      "http" | "https" => {
+        self.check_net_url(u)?;
+      }
+      "file" => {
+        let filename = u
+          .to_file_path()
+          .unwrap()
+          .into_os_string()
+          .into_string()
+          .unwrap();
+        self.check_read(&filename)?;
+      }
+      // TODO(ry) Handle error without gracefully.
+      _ => panic!("Unsupported scheme for dynamic import"),
+    }
+    Ok(())
+  }
+
   #[cfg(test)]
   pub fn mock(argv: Vec<String>) -> ThreadSafeState {
     ThreadSafeState::new(

diff --git a/cli/worker.rs b/cli/worker.rs
@@ -1,5 +1,4 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-use crate::dyn_import;
 use crate::fmt_errors::JSError;
 use crate::state::ThreadSafeState;
 use crate::tokio_util;
@@ -40,14 +39,12 @@ impl Worker {
 
       let state_ = state.clone();
       i.set_dyn_import(move |id, specifier, referrer| {
-        Box::new(dyn_import::DynamicRecursiveLoad(
-          RecursiveLoad::dynamic_import(
-            id,
-            specifier,
-            referrer,
-            state_.clone(),
-            state_.modules.clone(),
-          ),
+        Box::new(RecursiveLoad::dynamic_import(
+          id,
+          specifier,
+          referrer,
+          state_.clone(),
+          state_.modules.clone(),
         ))
       });
 

diff --git a/tests/error_015_dynamic_import_permissions.out b/tests/error_015_dynamic_import_permissions.out
@@ -1 +1 @@
-[WILDCARD]error: Uncaught TypeError: permission denied
+error: Uncaught TypeError: permission denied