Make the RoomIdPattern strict

KLab · Apr 3, 2024 · 1ba50d7 · 1ba50d7
1 parent ec459c8
commit 1ba50d7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/server/common/const.go b/server/common/const.go
@@ -6,5 +6,5 @@ const (
 	HostStatusClosing  = 2
 
 	RoomIdLen     = 32
-	RoomIdPattern = "^[0-9a-f]+$"
+	RoomIdPattern = "^[0-9a-f]{32}$"
 )
diff --git a/server/game/repository.go b/server/game/repository.go
@@ -84,7 +84,7 @@ func RandomHex(n int) string {
 }
 
 func IsValidRoomId(id string) bool {
-	return rerid.Match([]byte(id))
+	return rerid.MatchString(id)
 }
 
 type Repository struct {

diff --git a/server/game/repository_test.go b/server/game/repository_test.go
@@ -40,9 +40,11 @@ func TestQueries(t *testing.T) {
 
 func TestIsValidRoomId(t *testing.T) {
 	tests := map[string]bool{
-		"123456789abcdef": true,
-		"123456789ABCDEF": false,
-		"":                false,
+		"0123456789abcdef0123456789abcdef":  true,
+		"0123456789ABCDEF0123456789ABCDEF":  false,
+		"0123456789abcdef0123456789abcde":   false,
+		"0123456789abcdef0123456789abcdef0": false,
+		"":                                  false,
 	}
 
 	for id, valid := range tests {