Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Using basic_auth()/bearer_auth overrides the username in the URL #228

Merged
merged 1 commit into from
Dec 27, 2024
Merged

fix: Using basic_auth()/bearer_auth overrides the username in the URL #228

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions src/client/request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,17 @@ impl RequestBuilder {
HeaderValue: TryFrom<V>,
<HeaderValue as TryFrom<V>>::Error: Into<http::Error>,
{
self.header_sensitive(key, value, false)
self.header_sensitive(key, value, false, false)
}

/// Add a `Header` to this Request with ability to define if `header_value` is sensitive.
fn header_sensitive<K, V>(mut self, key: K, value: V, sensitive: bool) -> RequestBuilder
fn header_sensitive<K, V>(
mut self,
key: K,
value: V,
sensitive: bool,
overwrite: bool,
) -> RequestBuilder
where
HeaderName: TryFrom<K>,
<HeaderName as TryFrom<K>>::Error: Into<http::Error>,
Expand All @@ -278,7 +284,11 @@ impl RequestBuilder {
if sensitive {
value.set_sensitive(true);
}
req.headers_mut().append(key, value);
if overwrite {
req.headers_mut().insert(key, value);
} else {
req.headers_mut().append(key, value);
}
}
Err(e) => error = Some(crate::error::builder(e.into())),
},
Expand Down Expand Up @@ -312,7 +322,7 @@ impl RequestBuilder {
return self;
}
if let Ok(host_with_port) = authority.parse::<HeaderValue>() {
return self.header_sensitive(HOST, host_with_port, false);
return self.header_sensitive(HOST, host_with_port, false, false);
}
}
self
Expand All @@ -338,7 +348,7 @@ impl RequestBuilder {
P: fmt::Display,
{
let header_value = crate::util::basic_auth(username, password);
self.header_sensitive(crate::header::AUTHORIZATION, header_value, true)
self.header_sensitive(crate::header::AUTHORIZATION, header_value, true, true)
}

/// Enable HTTP bearer authentication.
Expand All @@ -347,7 +357,7 @@ impl RequestBuilder {
T: fmt::Display,
{
let header_value = format!("Bearer {}", token);
self.header_sensitive(crate::header::AUTHORIZATION, header_value, true)
self.header_sensitive(crate::header::AUTHORIZATION, header_value, true, true)
}

/// Set the request body.
Expand Down