lib/ureq
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use match expression against RedirectAuthHeaders to ensure exhaustive

Browse Source
This commit is contained in:
Martin Algesten
2021-12-11 08:50:18 +01:00
parent c59632bd97
commit 27533cf31b
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/unit.rs
View File

@@ -355,13 +355,21 @@ fn connect_socket(unit: &Unit, hostname: &str, use_pooled: bool) -> Result<(Stre
} }
fn can_propagate_authorization_on_redirect(unit: &Unit, history: &[Url]) -> bool { fn can_propagate_authorization_on_redirect(unit: &Unit, history: &[Url]) -> bool {
if let RedirectAuthHeaders::SameHost = unit.agent.config.redirect_auth_headers { match unit.agent.config.redirect_auth_headers {
let host_s = unit.url.host_str().unwrap(); RedirectAuthHeaders::Never => false,
RedirectAuthHeaders::SameHost => {
let host = unit.url.host_str();
let is_https = unit.url.scheme() == "https";
// This is fine because we only do this check on redirects where there
// must be a previous host.
let prev_url = &history[0]; let prev_url = &history[0];
let prev_host = prev_url.host_str().expect("Host in previous Url");
host_s == prev_host && prev_url.scheme() == "https" && unit.url.scheme() == "https" let prev_host = prev_url.host_str();
} else { let prev_is_https = prev_url.scheme() == "https";
false
host == prev_host && prev_is_https && is_https
}
} }
} }