Fix proxy urls that end with trailing slash

Close #402
This commit is contained in:
Martin Algesten
2021-08-12 12:46:12 +02:00
parent 641eb3df10
commit 485647d5de

View File

@@ -79,11 +79,13 @@ impl Proxy {
/// * `john:smith@socks.google.com:8000` /// * `john:smith@socks.google.com:8000`
/// * `localhost` /// * `localhost`
pub fn new<S: AsRef<str>>(proxy: S) -> Result<Self, Error> { pub fn new<S: AsRef<str>>(proxy: S) -> Result<Self, Error> {
let mut proxy_parts = proxy let mut proxy = proxy.as_ref();
.as_ref()
.splitn(2, "://") while proxy.ends_with('/') {
.collect::<Vec<&str>>() proxy = &proxy[..(proxy.len() - 1)];
.into_iter(); }
let mut proxy_parts = proxy.splitn(2, "://").collect::<Vec<&str>>().into_iter();
let proto = if proxy_parts.len() == 2 { let proto = if proxy_parts.len() == 2 {
match proxy_parts.next() { match proxy_parts.next() {
@@ -196,6 +198,16 @@ mod tests {
assert_eq!(proxy.proto, Proto::HTTPConnect); assert_eq!(proxy.proto, Proto::HTTPConnect);
} }
#[test]
fn parse_proxy_http_user_pass_server_port_trailing_slash() {
let proxy = Proxy::new("http://user:p@ssw0rd@localhost:9999/").unwrap();
assert_eq!(proxy.user, Some(String::from("user")));
assert_eq!(proxy.password, Some(String::from("p@ssw0rd")));
assert_eq!(proxy.server, String::from("localhost"));
assert_eq!(proxy.port, 9999);
assert_eq!(proxy.proto, Proto::HTTPConnect);
}
#[cfg(feature = "socks-proxy")] #[cfg(feature = "socks-proxy")]
#[test] #[test]
fn parse_proxy_socks4_user_pass_server_port() { fn parse_proxy_socks4_user_pass_server_port() {