alois/OpenFrontIO
1
0
Fork 0
mirror of https://github.com/openfrontio/OpenFrontIO.git synced 2026-07-07 16:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24 from RealJoesphStalin/stalin2

Browse Source 
Fix: allow emojis in safestring
This commit is contained in:
evanpelle
2025-02-12 08:13:05 -08:00
committed by GitHub
parent 8532b02bbd d6dce787c0
commit c1b2057905
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/Schemas.ts
+4 -1
View File
@@ -100,7 +100,8 @@ const GameConfigSchema = z.object({
const SafeString = z
.string()
// Remove common dangerous characters and patterns
.regex(/^[a-zA-Z0-9\s.,!?@#$%&*()-_+=\[\]{}|;:"'\/]+$/)
// The weird \u stuff is to allow emojis
.regex(/^[a-zA-Z0-9\s.,!?@#$%&*()-_+=\[\]{}|;:"'\/\u00a9|\u00ae|[\u2000-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff]]+$/)
// Reasonable max length to prevent DOS
.max(1000);
@@ -323,3 +324,5 @@ export const GameRecordSchema = z.object({
turns: z.array(TurnSchema),
winner: ID.nullable(),
});
src/core/validations/username.ts
+2 -2
View File
@@ -13,7 +13,7 @@ const matcher = new RegExpMatcher({
export const MIN_USERNAME_LENGTH = 3;
export const MAX_USERNAME_LENGTH = 27;
const validPattern = /^[a-zA-Z0-9_\[\] 🐈🍀]+$/;
const validPattern = /^[a-zA-Z0-9_\[\] 🐈🍀]+$/u;
const shadowNames = [
"NicePeopleOnly",
@@ -71,7 +71,7 @@ export function validateUsername(username: string): {
export function sanitizeUsername(str: string): string {
const sanitized = str
.replace(/[^a-zA-Z0-9_\[\] 🐈🍀]/g, "")
.replace(/[^a-zA-Z0-9_\[\] 🐈🍀]/gu, "")
.slice(0, MAX_USERNAME_LENGTH);
return sanitized.padEnd(MIN_USERNAME_LENGTH, "x");
}