foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-26 16:09:27 -05:00
Code Issues Packages 1 Wiki Activity

fix(imports): fix panic on unsupported scheme (#5131)

Browse source
This commit is contained in:
Bartek Iwańczuk 2020-05-07 15:57:10 +02:00 committed by GitHub
parent dabe88f854
commit 0ba90c8c11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/file_fetcher.rs
View file

@ -93,7 +93,7 @@ impl SourceFileFetcher {
Ok(file_fetcher) Ok(file_fetcher)
} }
fn check_if_supported_scheme(url: &Url) -> Result<(), ErrBox> { pub fn check_if_supported_scheme(url: &Url) -> Result<(), ErrBox> {
if !SUPPORTED_URL_SCHEMES.contains(&url.scheme()) { if !SUPPORTED_URL_SCHEMES.contains(&url.scheme()) {
return Err( return Err(
OpError::other( OpError::other(

5
cli/state.rs
View file

@ -1,5 +1,6 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
use crate::compilers::TargetLib; use crate::compilers::TargetLib;
use crate::file_fetcher::SourceFileFetcher;
use crate::global_state::GlobalState; use crate::global_state::GlobalState;
use crate::global_timer::GlobalTimer; use crate::global_timer::GlobalTimer;
use crate::import_map::ImportMap; use crate::import_map::ImportMap;
@ -474,6 +475,10 @@ impl State {
module_specifier: &ModuleSpecifier, module_specifier: &ModuleSpecifier,
) -> Result<(), OpError> { ) -> Result<(), OpError> {
let u = module_specifier.as_url(); let u = module_specifier.as_url();
// TODO(bartlomieju): temporary fix to prevent hitting `unreachable`
// statement that is actually reachable...
SourceFileFetcher::check_if_supported_scheme(u)?;
match u.scheme() { match u.scheme() {
"http" | "https" => { "http" | "https" => {
self.check_net_url(u)?; self.check_net_url(u)?;

7
cli/tests/integration_tests.rs
View file

@ -1583,6 +1583,13 @@ itest!(run_v8_help {
output: "v8_help.out", output: "v8_help.out",
}); });
itest!(unsupported_dynamic_import_scheme {
args: "eval import('xxx:')",
output: "unsupported_dynamic_import_scheme.out",
check_stderr: true,
exit_code: 1,
});
itest!(wasm { itest!(wasm {
args: "run wasm.ts", args: "run wasm.ts",
output: "wasm.ts.out", output: "wasm.ts.out",

5
cli/tests/unsupported_dynamic_import_scheme.out Normal file
View file

@ -0,0 +1,5 @@
error: Uncaught TypeError: Unsupported scheme "xxx" for module "xxx:". Supported schemes: [
"http",
"https",
"file",
]