Update AP helpers, improve preferredUsername validation

pixelfed · Nov 9, 2023 · 21218c7 · 21218c7
1 parent ff27229
commit 21218c7
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php
@@ -760,6 +760,13 @@ public static function profileUpdateOrCreate($url)
         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;