foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 09:31:22 -05:00
Code Issues Packages 1 Wiki Activity

fetch: proper error for unsupported protocol (#4085)

Browse source
This commit is contained in:
Kevin (Kun) "Kassimo" Qian 2020-02-23 06:45:02 -08:00 • committed by GitHub
parent bf48f5fa5a
commit e9fff02e96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cli/js/fetch_test.ts
View file

@ -9,6 +9,17 @@ import {
fail
} from "./test_util.ts";
testPerm({ net: true }, async function fetchProtocolError(): Promise<void> {
let err;
try {
await fetch("file:///");
} catch (err_) {
err = err_;
}
assert(err instanceof TypeError);
assertStrContains(err.message, "not supported");
});
testPerm({ net: true }, async function fetchConnectionError(): Promise<void> {
let err;
try {

15
cli/ops/fetch.rs
View file

@ -1,6 +1,8 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
use super::dispatch_json::{Deserialize, JsonOp, Value};
use super::io::StreamResource;
use crate::deno_error::DenoError;
use crate::deno_error::ErrorKind;
use crate::http_util::{create_http_client, HttpBody};
use crate::ops::json_op;
use crate::state::State;
@ -40,6 +42,19 @@ pub fn op_fetch(
};
let url_ = url::Url::parse(&url).map_err(ErrBox::from)?;
// Check scheme before asking for net permission
let scheme = url_.scheme();
if scheme != "http" && scheme != "https" {
return Err(
DenoError::new(
ErrorKind::TypeError,
format!("scheme '{}' not supported", scheme),
)
.into(),
);
}
state.check_net_url(&url_)?;
let mut request = client.request(method, url_);

6
cli/permissions.rs
View file

@ -1,5 +1,6 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
use crate::deno_error::{other_error, permission_denied_msg};
use crate::deno_error::{DenoError, ErrorKind};
use crate::flags::DenoFlags;
use ansi_term::Style;
#[cfg(not(test))]
@ -193,8 +194,11 @@ impl DenoPermissions {
}
pub fn check_net_url(&self, url: &url::Url) -> Result<(), ErrBox> {
let host = url.host_str().ok_or_else(|| {
DenoError::new(ErrorKind::URIError, "missing host".to_owned())
})?;
self
.get_state_net(&format!("{}", url.host().unwrap()), url.port())
.get_state_net(host, url.port())
.check(&format!("network access to \"{}\"", url), "--allow-net")
}