chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

Update AP helpers, improve preferredUsername validation

Browse source
This commit is contained in:
Daniel Supernault 2023-11-09 02:47:20 -07:00
parent ff272292ef
commit 21218c794b
No known key found for this signature in database
GPG key ID: 23740873EE6F76A1
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Util/ActivityPub/Helpers.php
View file

@ -760,6 +760,13 @@ class Helpers {
if(!isset($res['preferredUsername']) && !isset($res['nickname'])) { if(!isset($res['preferredUsername']) && !isset($res['nickname'])) {
return; return;
} }
// skip invalid usernames
if(!ctype_alnum($res['preferredUsername'])) {
$tmpUsername = str_replace(['_', '.', '-'], '', $res['preferredUsername']);
if(!ctype_alnum($tmpUsername)) {
return;
}
}
$username = (string) Purify::clean($res['preferredUsername'] ?? $res['nickname']); $username = (string) Purify::clean($res['preferredUsername'] ?? $res['nickname']);
if(empty($username)) { if(empty($username)) {
return; return;