forked/reqwest-impersonate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix panicking when passed a file:// URL

Browse Source 
Closes #347
This commit is contained in:
Sean McArthur
2018-09-18 12:42:49 -07:00
parent 68d012e954
commit 610cdd266c
5 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/error.rs
View File

@@ -119,6 +119,7 @@ impl Error {
Kind::Io(ref e) => Some(e),
Kind::UrlEncoded(ref e) => Some(e),
Kind::Json(ref e) => Some(e),
Kind::UrlBadScheme |
Kind::TooManyRedirects |
Kind::RedirectLoop |
Kind::ClientError(_) |
@@ -196,6 +197,7 @@ impl fmt::Display for Error {
Kind::Hyper(ref e) => fmt::Display::fmt(e, f),
Kind::Mime(ref e) => fmt::Display::fmt(e, f),
Kind::Url(ref e) => fmt::Display::fmt(e, f),
Kind::UrlBadScheme => f.write_str("URL scheme is not allowed"),
Kind::Tls(ref e) => fmt::Display::fmt(e, f),
Kind::Io(ref e) => fmt::Display::fmt(e, f),
Kind::UrlEncoded(ref e) => fmt::Display::fmt(e, f),
@@ -221,6 +223,7 @@ impl StdError for Error {
Kind::Hyper(ref e) => e.description(),
Kind::Mime(ref e) => e.description(),
Kind::Url(ref e) => e.description(),
Kind::UrlBadScheme => "URL scheme is not allowed",
Kind::Tls(ref e) => e.description(),
Kind::Io(ref e) => e.description(),
Kind::UrlEncoded(ref e) => e.description(),
@@ -242,6 +245,7 @@ impl StdError for Error {
Kind::Io(ref e) => e.cause(),
Kind::UrlEncoded(ref e) => e.cause(),
Kind::Json(ref e) => e.cause(),
Kind::UrlBadScheme |
Kind::TooManyRedirects |
Kind::RedirectLoop |
Kind::ClientError(_) |
@@ -258,6 +262,7 @@ pub(crate) enum Kind {
Hyper(::hyper::Error),
Mime(::mime::FromStrError),
Url(::url::ParseError),
UrlBadScheme,
Tls(::native_tls::Error),
Io(io::Error),
UrlEncoded(::serde_urlencoded::ser::Error),
@@ -438,6 +443,13 @@ pub(crate) fn server_error(url: Url, status: StatusCode) -> Error {
}
}
pub(crate) fn url_bad_scheme(url: Url) -> Error {
Error {
kind: Kind::UrlBadScheme,
url: Some(url),
}
}
#[cfg(test)]
mod tests {
use super::*;