Update AP helpers, improve preferredUsername validation

2 years ago · 21218c794b
parent ff272292ef
commit 21218c794b
1 changed files with 7 additions and 0 deletions
--- a/app/Util/ActivityPub/Helpers.php
+++ b/app/Util/ActivityPub/Helpers.php
@ -760,6 +760,13 @@ class Helpers {
        if(!isset($res['preferredUsername']) && !isset($res['nickname'])) {
            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']);
        if(empty($username)) {
            return;