filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix same-host JMAP redirection on non-standard ports (#2271)

Browse Source 
Fixes #2221
This commit is contained in:
Renato Caldas
2025-12-18 13:47:59 +00:00
committed by GitHub
parent c06e88cf7d
commit c28766bd38
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/cli/src/modules/mod.rs
View File

@@ -239,13 +239,11 @@ pub async fn name_to_id(client: &Client, name: &str) -> String {
pub fn host(url: &str) -> Option<&str> { pub fn host(url: &str) -> Option<&str> {
url.split_once("://") url.split_once("://")
.map(|(_, url)| url.split_once('/').map_or(url, |(host, _)| host)) .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 { pub fn is_localhost(url: &str) -> bool {
host(url).is_some_and(|host| { host(url).is_some_and(|host| host == "localhost" || host == "127.0.0.1" || host == "[::1]")
let host = host.rsplit_once(':').map_or(host, |(host, _)| host);
host == "localhost" || host == "127.0.0.1" || host == "[::1]"
})
} }
pub trait OAuthResponse { pub trait OAuthResponse {