LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-27 06:41:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing domain checking.

Browse source
This commit is contained in:
Dessalines 2024-04-22 14:59:06 -04:00
parent e22909697b
commit 0e2b3952bf
2 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
crates/api_common/src/utils.rs
View file

@ -537,23 +537,15 @@ pub async fn get_url_blocklist(context: &LemmyContext) -> LemmyResult<RegexSet>
let urls = LocalSiteUrlBlocklist::get_all(&mut context.pool()).await?; let urls = LocalSiteUrlBlocklist::get_all(&mut context.pool()).await?;
let regexes = urls.iter().map(|url| { let regexes = urls.iter().map(|url| {
let url = &url.url; // The scheme is removed in the saving,
let parsed = Url::parse(url).expect("Coundln't parse URL."); // so fake it here to build the url.
if url.ends_with('/') { let url = &format!("https://{}", url.url);
format!( let parsed = Url::parse(url).expect("Couldn't parse URL.");
"({}://)?{}{}?", format!(
parsed.scheme(), "{}{}",
escape(parsed.domain().expect("No domain.")), escape(parsed.host_str().expect("No domain.")),
escape(parsed.path()) escape(parsed.path())
) )
} else {
format!(
"({}://)?{}{}",
parsed.scheme(),
escape(parsed.domain().expect("No domain.")),
escape(parsed.path())
)
}
}); });
let set = RegexSet::new(regexes)?; let set = RegexSet::new(regexes)?;

4
crates/utils/src/utils/validation.rs
View file

@ -624,12 +624,12 @@ mod tests {
"example.com".to_string(), "example.com".to_string(),
"http://example.com".to_string(), "http://example.com".to_string(),
"https://example.com".to_string(), "https://example.com".to_string(),
"https://example.blog/test?q=test2&q2=test3#test4".to_string(), "https://example.com/test?q=test2&q2=test3#test4".to_string(),
]) ])
.unwrap(), .unwrap(),
&vec![ &vec![
"example.com/".to_string(), "example.com/".to_string(),
"example.blog/test?q=test2&q2=test3#test4".to_string() "example.com/test?q=test2&q2=test3#test4".to_string()
], ],
); );