ForgeFlux/activitypub-federation-rust
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change username regex in webfinger (#34)

Browse source 
* Change username regex in webfinger

Changes the regex used for username in `extract_webfinger_name` to
include additional characters like '.' and '-'. This is the same regex
used in Mastodon.

* Add link to Mastodon regex
This commit is contained in:
Grafcube 2023-04-03 01:02:54 +05:30 committed by GitHub
parent c56f526914
commit 813d7943e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/fetch/webfinger.rs
View file

@ -71,8 +71,13 @@ where
T: Clone, T: Clone,
{ {
// TODO: would be nice if we could implement this without regex and remove the dependency // TODO: would be nice if we could implement this without regex and remove the dependency
let regex = Regex::new(&format!("^acct:([a-zA-Z0-9_]{{3,}})@{}$", data.domain())) // Regex taken from Mastodon -
.map_err(Error::other)?; // https://github.com/mastodon/mastodon/blob/2b113764117c9ab98875141bcf1758ba8be58173/app/models/account.rb#L65
let regex = Regex::new(&format!(
"^acct:((?i)[a-z0-9_]+([a-z0-9_\\.-]+[a-z0-9_]+)?)@{}$",
data.domain()
))
.map_err(Error::other)?;
Ok(regex Ok(regex
.captures(query) .captures(query)
.and_then(|c| c.get(1)) .and_then(|c| c.get(1))