fix regexp cve (#1622)

keldaanCommunity · Apr 3, 2024 · 8906cbe · 8906cbe
1 parent 509ea41
commit 8906cbe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/rooms/commands/lobby-commands.ts b/app/rooms/commands/lobby-commands.ts
@@ -380,8 +380,8 @@ export class OpenBoosterCommand extends Command<
 
 function pickRandomPokemonBooster(guarantedUnique: boolean): PkmWithConfig {
   let pkm = Pkm.MAGIKARP,
-    shiny = chance(0.03),
     emotion = Emotion.NORMAL
+  const shiny = chance(0.03)
   const rarities = Object.keys(Rarity) as Rarity[]
   const seed = Math.random() * sum(Object.values(BoosterRarityProbability))
   let threshold = 0

diff --git a/app/types/index.ts b/app/types/index.ts
@@ -43,8 +43,8 @@ export const CDN_PORTRAIT_URL =
 export const CDN_URL =
   "https://raw.githubusercontent.com/keldaanCommunity/SpriteCollab/master"
 
-export const USERNAME_REGEXP =
-  /^(?=.{4,20}$)(?:[\u0021-\uFFFF]+(?:(?:\.|-|_)[\u0021-\uFFFF])*)+$/
+// eslint-disable-next-line no-useless-escape
+export const USERNAME_REGEXP = /^[a-zA-Z0-9\._\-]{2,20}[^.-]$/
 
 export type NonFunctionPropNames<T> = {
   // eslint-disable-next-line @typescript-eslint/ban-types