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

RUST-1021 use ServerAddress::parse for URI parsing #471

Merged
merged 2 commits into from
Sep 22, 2021
Merged

RUST-1021 use ServerAddress::parse for URI parsing #471

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
926bb3a
RUST-1021 use ServerAddress::parse for URI parsing
Sep 21, 2021
255eca4
formatting
Sep 21, 2021
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
74 changes: 24 additions & 50 deletions src/client/options/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,23 @@ impl FromStr for ServerAddress {
}

impl ServerAddress {
/// Parses an address string into a `StreamAddress`.
/// Parses an address string into a `ServerAddress`.
pub fn parse(address: impl AsRef<str>) -> Result<Self> {
let address = address.as_ref();
let mut parts = address.split(':');

let hostname = match parts.next() {
Some(part) => part,
Some(part) => {
if part.is_empty() {
return Err(ErrorKind::InvalidArgument {
message: format!(
"invalid server address: \"{}\"; hostname cannot be empty",
address
),
}
.into());
}
part
}
None => {
return Err(ErrorKind::InvalidArgument {
message: format!("invalid server address: \"{}\"", address),
Expand All @@ -200,6 +210,15 @@ impl ServerAddress {
),
})?;

if port == 0 {
return Err(ErrorKind::InvalidArgument {
message: format!(
"invalid server address: \"{}\"; port must be non-zero",
address
),
}
.into());
}
if parts.next().is_some() {
return Err(ErrorKind::InvalidArgument {
message: format!(
Expand All @@ -216,7 +235,7 @@ impl ServerAddress {
};

Ok(ServerAddress::Tcp {
host: hostname.to_string(),
host: hostname.to_lowercase(),
port,
})
}
Expand Down Expand Up @@ -1327,52 +1346,7 @@ impl ClientOptionsParser {
None => (None, None),
};

let hosts: Result<Vec<_>> = hosts_section
.split(',')
.map(|host| {
let (hostname, port) = match host.find(':') {
Some(index) => host.split_at(index),
None => (host, ""),
};

if hostname.is_empty() {
return Err(ErrorKind::InvalidArgument {
message: "connection string contains no host".to_string(),
}
.into());
}
let port = if port.is_empty() {
None
} else {
let port_string_without_colon = &port[1..];
let p: u16 = port_string_without_colon.parse().map_err(|_| {
ErrorKind::InvalidArgument {
message: format!(
"invalid port specified in connection string: {}",
port
),
}
})?;

if p == 0 {
return Err(ErrorKind::InvalidArgument {
message: format!(
"invalid port specified in connection string: {}",
port
),
}
.into());
}

Some(p)
};

Ok(ServerAddress::Tcp {
host: hostname.to_lowercase(),
port,
})
})
.collect();
let hosts: Result<Vec<_>> = hosts_section.split(',').map(ServerAddress::parse).collect();

let hosts = hosts?;

Expand Down