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

Setup TLS adaptor when parsing an amqprs uri #121

Merged
merged 8 commits into from
Feb 28, 2024
Merged

Setup TLS adaptor when parsing an amqprs uri #121

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
16fb4da
Setup TLS adaptor when parsing an amqprs uri
tyilo Jan 15, 2024
a747e6c
Don't use too new Rust features
tyilo Jan 25, 2024
683b675
Fix clippy lints
tyilo Jan 25, 2024
98dc2a4
Fix compiling with urlspec, but not tls feature
tyilo Jan 25, 2024
df79dcd
Add test for trying to parse an amqps url without the tls feature
tyilo Jan 25, 2024
a8615a3
Check tls adaptor domain in test
tyilo Jan 25, 2024
fae4b07
Remove test that doesn't apply anymore
tyilo Feb 16, 2024
36cef87
Merge branch 'main' into from-str-amqps
tyilo Feb 16, 2024
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
34 changes: 24 additions & 10 deletions amqprs/src/api/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,9 @@ impl TryFrom<&str> for OpenConnectionArguments {
.unwrap_or("guest");

// Apply authority
let host = pu_authority.host().to_string();
let mut args = OpenConnectionArguments::new(
pu_authority.host().to_string().as_str(),
host.as_str(),
pu_authority.port().unwrap_or(default_port),
pu_authority_username,
pu_authority_password,
Expand Down Expand Up @@ -519,6 +520,17 @@ impl TryFrom<&str> for OpenConnectionArguments {
.unwrap_or(DEFAULT_HEARTBEAT);
args.heartbeat(heartbeat);

if scheme == AMQPS_SCHEME {
#[cfg(feature = "tls")]
args.tls_adaptor(
TlsAdaptor::without_client_auth(None, host.to_string())
.map_err(|e| Error::UriError(format!("error creating TLS adaptor: {}", e)))?,
);

#[cfg(not(feature = "tls"))]
return Err(Error::UriError("can't create amqps url without the `tls` feature enabled".to_string()));
}

Ok(args)
}
}
Expand Down Expand Up @@ -1472,6 +1484,15 @@ mod tests {
assert_eq!(args.heartbeat, 30);
}

#[cfg(all(feature = "urispec", not(feature = "tls")))]
#[test]
fn test_urispec_amqps_without_tls() {
match OpenConnectionArguments::try_from("amqps://user:bitnami@localhost?heartbeat=10") {
Ok(_) => panic!("Unexpected ok"),
Err(e) => assert!(matches!(e, crate::api::Error::UriError(_))),
}
}

#[cfg(all(feature = "urispec", feature = "tls"))]
#[test]
fn test_urispec_amqps() {
Expand All @@ -1481,15 +1502,8 @@ mod tests {
assert_eq!(args.port, 5671);
assert_eq!(args.virtual_host, "/");
assert_eq!(args.heartbeat, 10);
}

#[cfg(all(feature = "urispec", feature = "tls"))]
#[tokio::test]
#[should_panic(expected = "UriError")]
async fn test_amqps_scheme_without_tls() {
let args = OpenConnectionArguments::try_from("amqps://user:bitnami@localhost?heartbeat=10")
.unwrap();
Connection::open(&args).await.unwrap();
let tls_adaptor = args.tls_adaptor.unwrap();
assert_eq!(tls_adaptor.domain, "localhost");
}

#[cfg(all(feature = "urispec", feature = "tls"))]
Expand Down
Loading