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

Jump to bottom

Allow setting basic auth credentials in websocket url #590

Merged
merged 6 commits into from
Feb 4, 2022
Merged

Allow setting basic auth credentials in websocket url #590

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
074298c
Allow setting basic auth credentials in websocket url
Jan 26, 2022
5a64ee7
Remove trace logging
717a56e1 Feb 2, 2022
4fd7b6e
Remove redundant to_str
717a56e1 Feb 2, 2022
2cfc384
Format
717a56e1 Feb 2, 2022
36c5004
Merge branch 'master' into master
tomusdrw Feb 4, 2022
3635e60
cargo fmt --all
tomusdrw Feb 4, 2022
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
14 changes: 14 additions & 0 deletions src/transports/ws.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,20 @@ impl WsServerTask {
resource
);
let mut client = Client::new(socket, host, &resource);
let maybe_encoded = url.password().map(|password| {
use headers::authorization::{Authorization, Credentials};
log::trace!("Basic auth username: {}", url.username());
log::trace!("Basic auth password: {}", password);
717a56e1 marked this conversation as resolved.
Show resolved Hide resolved
Authorization::basic(url.username(), password).0.encode().to_str().unwrap().as_bytes().to_owned()
717a56e1 marked this conversation as resolved.
Show resolved Hide resolved
});

let headers = if let Some(ref head) = maybe_encoded {
Some([soketto::handshake::client::Header {name: "Authorization",value: &head }])
717a56e1 marked this conversation as resolved.
Show resolved Hide resolved
} else { None };

if let Some(ref head) = headers {
client.set_headers(head);
}
let handshake = client.handshake();
let (sender, receiver) = match handshake.await? {
ServerResponse::Accepted { .. } => client.into_builder().finish(),
Expand Down