grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't change encoding style in clean_url_params (#4802)

Browse source 
* Don't change encoding style in `clean_url_params`

Fixes #4801

* fmt

* fix
This commit is contained in:
dullbananas 2024-06-12 17:35:27 -07:00 committed by GitHub
parent b2a480f55c
commit 046375171e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,9 @@ static VALID_MATRIX_ID_REGEX: Lazy<Regex> = Lazy::new(|| {
}); });
// taken from https://en.wikipedia.org/wiki/UTM_parameters // taken from https://en.wikipedia.org/wiki/UTM_parameters
static CLEAN_URL_PARAMS_REGEX: Lazy<Regex> = Lazy::new(|| { static CLEAN_URL_PARAMS_REGEX: Lazy<Regex> = Lazy::new(|| {
Regex::new(r"^utm_source|utm_medium|utm_campaign|utm_term|utm_content|gclid|gclsrc|dclid|fbclid$") Regex::new(
r"^(utm_source|utm_medium|utm_campaign|utm_term|utm_content|gclid|gclsrc|dclid|fbclid)=",
)
.expect("compile regex") .expect("compile regex")
}); });
const ALLOWED_POST_URL_SCHEMES: [&str; 3] = ["http", "https", "magnet"]; const ALLOWED_POST_URL_SCHEMES: [&str; 3] = ["http", "https", "magnet"];
@ -256,12 +258,11 @@ pub fn build_and_check_regex(regex_str_opt: &Option<&str>) -> LemmyResult<Option
pub fn clean_url_params(url: &Url) -> Url { pub fn clean_url_params(url: &Url) -> Url {
let mut url_out = url.clone(); let mut url_out = url.clone();
if url.query().is_some() { if let Some(query) = url.query() {
let new_query = url let new_query = query
.query_pairs() .split_inclusive('&')
.filter(|q| !CLEAN_URL_PARAMS_REGEX.is_match(&q.0)) .filter(|q| !CLEAN_URL_PARAMS_REGEX.is_match(q))
.map(|q| format!("{}={}", q.0, q.1)) .collect::<String>();
.join("&");
url_out.set_query(Some(&new_query)); url_out.set_query(Some(&new_query));
} }
url_out url_out
@ -369,9 +370,9 @@ mod tests {
#[test] #[test]
fn test_clean_url_params() -> LemmyResult<()> { fn test_clean_url_params() -> LemmyResult<()> {
let url = Url::parse("https://example.com/path/123?utm_content=buffercf3b2&utm_medium=social&username=randomuser&id=123")?; let url = Url::parse("https://example.com/path/123?utm_content=buffercf3b2&utm_medium=social&user+name=random+user%20&id=123")?;
let cleaned = clean_url_params(&url); let cleaned = clean_url_params(&url);
let expected = Url::parse("https://example.com/path/123?username=randomuser&id=123")?; let expected = Url::parse("https://example.com/path/123?user+name=random+user%20&id=123")?;
assert_eq!(expected.to_string(), cleaned.to_string()); assert_eq!(expected.to_string(), cleaned.to_string());
let url = Url::parse("https://example.com/path/123")?; let url = Url::parse("https://example.com/path/123")?;