From c28766bd385c10f159ad85943f7a5283f596eb01 Mon Sep 17 00:00:00 2001 From: Renato Caldas Date: Thu, 18 Dec 2025 13:47:59 +0000 Subject: [PATCH] Fix same-host JMAP redirection on non-standard ports (#2271) Fixes #2221 --- crates/cli/src/modules/mod.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/crates/cli/src/modules/mod.rs b/crates/cli/src/modules/mod.rs index c7073fa3..5fba37b6 100644 --- a/crates/cli/src/modules/mod.rs +++ b/crates/cli/src/modules/mod.rs @@ -239,13 +239,11 @@ pub async fn name_to_id(client: &Client, name: &str) -> String { pub fn host(url: &str) -> Option<&str> { url.split_once("://") .map(|(_, url)| url.split_once('/').map_or(url, |(host, _)| host)) + .map(|host| host.rsplit_once(':').map_or(host, |(host, _)| host)) } pub fn is_localhost(url: &str) -> bool { - host(url).is_some_and(|host| { - let host = host.rsplit_once(':').map_or(host, |(host, _)| host); - host == "localhost" || host == "127.0.0.1" || host == "[::1]" - }) + host(url).is_some_and(|host| host == "localhost" || host == "127.0.0.1" || host == "[::1]") } pub trait OAuthResponse {