From 427da97c0955f6dc7f1ca24befe67a73afdadf69 Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 17 Jul 2024 05:44:41 +0000 Subject: [PATCH] fix replacing urls i think --- src/urls.rs | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/urls.rs b/src/urls.rs index bc4ecfd..2deb70c 100644 --- a/src/urls.rs +++ b/src/urls.rs @@ -102,8 +102,10 @@ impl HostAndPath { } else { return None; } + } else if real_url.host.ends_with(&replace_from.host) { + replace_with.host.to_owned() } else { - replace_with.host.clone() + return None; } } else if real_url.host == replace_from.host { replace_with.host.clone() @@ -113,17 +115,17 @@ impl HostAndPath { // host matches, now check path - let new_path = if replace_from.path.ends_with('/') || replace_with.path.is_empty() { - if replace_with.path.ends_with('/') { + let new_path = if replace_from.path.ends_with('/') || replace_from.path.is_empty() { + if replace_with.path.ends_with('/') || replace_with.path.is_empty() { if let Some(path_without_prefix) = real_url.path.strip_prefix(&replace_from.path) { format!("{}{path_without_prefix}", replace_with.path) } else { return None; } - } else if replace_with.path.is_empty() { - real_url.path.clone() - } else { + } else if real_url.path.starts_with(&replace_from.path) { replace_with.path.clone() + } else { + return None; } } else if real_url.path == replace_from.path { replace_with.path.clone() @@ -229,4 +231,13 @@ mod tests { "https://medium.com/asdf", ); } + #[test] + fn test_non_matching_wildcard_to_absolute() { + test_replacement( + ".medium.com", + "scribe.rip", + "https://example.com/asdf", + "https://example.com/asdf", + ); + } }