sugoidogo/modrinth
1
0
Fork 0
mirror of https://github.com/modrinth/code.git synced 2026-08-25 00:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: app pinging servers over IPv6 (#7100)

Browse Source 
fix: app pinging servers opver IPv6
This commit is contained in:
aecsocket
2026-08-11 12:58:59 -04:00
committed by GitHub
parent 2d567b93ce
commit 2a43792fd9
1 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/app-lib/src/api/server_address.rs
+37 -8
View File
@@ -82,18 +82,20 @@ fn parse_server_address_inner(
address: &str, address: &str,
) -> std::result::Result<(&str, u16), String> { ) -> std::result::Result<(&str, u16), String> {
let (host, port_str) = if address.starts_with("[") { let (host, port_str) = if address.starts_with("[") {
let colon_index = address.find(':'); let (Some(colon_index), Some(close_bracket_index)) =
let close_bracket_index = address.rfind(']'); (address.find(':'), address.rfind(']'))
if colon_index.is_none() || close_bracket_index.is_none() { else {
return Err(format!("Invalid bracketed host/port: {address}"));
};
if close_bracket_index <= colon_index {
return Err(format!("Invalid bracketed host/port: {address}")); return Err(format!("Invalid bracketed host/port: {address}"));
} }
let close_bracket_index = close_bracket_index.unwrap();
let host = &address[1..close_bracket_index]; let host = &address[1..close_bracket_index];
if close_bracket_index + 1 == address.len() { if close_bracket_index + 1 == address.len() {
(host, "") (host, "")
} else { } else {
if address.as_bytes().get(close_bracket_index).copied() if address.as_bytes().get(close_bracket_index + 1).copied()
!= Some(b':') != Some(b':')
{ {
return Err(format!( return Err(format!(
@@ -109,9 +111,10 @@ fn parse_server_address_inner(
(host, port_str) (host, port_str)
} }
} else { } else {
let colon_pos = address.find(':'); if let Some((host, port)) = address.split_once(':')
if let Some(colon_pos) = colon_pos { && !port.contains(':')
(&address[..colon_pos], &address[colon_pos + 1..]) {
(host, port)
} else { } else {
(address, "") (address, "")
} }
@@ -164,3 +167,29 @@ pub async fn resolve_server_address(
.unwrap_or_else(|| (host.to_owned(), port)), .unwrap_or_else(|| (host.to_owned(), port)),
) )
} }
#[cfg(test)]
mod tests {
use super::parse_server_address_inner;
#[test]
fn parses_ipv4_server_addresses() {
for (address, expected) in [
("192.0.2.1", ("192.0.2.1", 25565)),
("192.0.2.1:25566", ("192.0.2.1", 25566)),
] {
assert_eq!(parse_server_address_inner(address), Ok(expected));
}
}
#[test]
fn parses_ipv6_server_addresses() {
for (address, expected) in [
("2001:db8::1", ("2001:db8::1", 25565)),
("[2001:db8::1]", ("2001:db8::1", 25565)),
("[2001:db8::1]:25566", ("2001:db8::1", 25566)),
] {
assert_eq!(parse_server_address_inner(address), Ok(expected));
}
}
}