fix(captcha): log errors in /siteverify reqs

rivet-gg · Sep 29, 2024 · dedc11c · dedc11c
2 parents d9aba12 + 47deee2
commit dedc11c
Show file tree

Hide file tree

Showing 43 changed files with 276 additions and 387 deletions.
diff --git a/modules/achievements/README.md b/modules/achievements/README.md
diff --git a/modules/achievements/module.json b/modules/achievements/module.json
diff --git a/modules/auth_email/module.json b/modules/auth_email/module.json
@@ -5,7 +5,8 @@
   "tags": [
     "core",
     "auth",
-    "user"
+    "user",
+    "internal"
   ],
   "authors": [
     "rivet-gg",

diff --git a/modules/auth_email_link/module.json b/modules/auth_email_link/module.json
@@ -5,7 +5,8 @@
   "tags": [
     "core",
     "auth",
-    "user"
+    "user",
+    "internal"
   ],
   "authors": [
     "rivet-gg",

diff --git a/modules/captcha/actors/throttle.ts b/modules/captcha/actors/throttle.ts
@@ -20,23 +20,27 @@ export class Actor extends ActorBase<Input, State> {
 	throttle(_ctx: ActorContext, req: ThrottleRequest): ThrottleResponse {
 		const now = Date.now();
 
+		this.state.count += 1;
+
+		if (this.state.start === 0) {
+			this.reset(_ctx, {});
+			return { success: false };
+		}
+
         if (now - this.state.start > req.period) {
-            this.state.start = now;
-            this.state.count = 1;
+            this.reset(_ctx, {});
             return { success: true };
         }
 
-        if (this.state.count >= req.requests) {
+        if (this.state.count > req.requests) {
             return { success: false };
         }
 
-        this.state.count += 1;
-
         return { success: true };
 	}
 
 	reset(_ctx: ActorContext, req: Empty): Empty {
-		this.state.start = 0;
+		this.state.start = Date.now();
 		this.state.count = 0;
 
 		return {};

diff --git a/modules/captcha/tests/e2e_guard.ts b/modules/captcha/tests/e2e_guard.ts
@@ -21,8 +21,33 @@ test("e2e success and failure", async (ctx: TestContext) => {
         }
     }
 
+
+    // First should fail
+    assertEquals(true, await didFail(async () => {
+        await ctx.modules.captcha.guard({
+            type: "ip",
+            key: "aaaa",
+            requests: REQUESTS,
+            period: PERIOD,
+            captchaProvider
+        });
+    }));
+
+    // So we solve
+    assertEquals(false, await didFail(async () => {
+        await ctx.modules.captcha.guard({
+            type: "ip",
+            key: "aaaa",
+            requests: REQUESTS,
+            period: PERIOD,
+            captchaProvider,
+            captchaToken: "foo"
+        });
+    }))
+
+    // The next REQUESTS - 1 should succeed
     assertEquals(false, await didFail(async () => {
-        for (let i = 0; i < REQUESTS; ++i) {
+        for (let i = 0; i < REQUESTS - 1; ++i) {
             await ctx.modules.captcha.guard({
                 type: "ip",
                 key: "aaaa",
@@ -33,6 +58,7 @@ test("e2e success and failure", async (ctx: TestContext) => {
         }
     }));
 
+    // Afterwhich, it should fail
     assertEquals(true, await didFail(async () => {
         await ctx.modules.captcha.guard({
             type: "ip",

diff --git a/modules/captcha/utils/providers/hcaptcha.ts b/modules/captcha/utils/providers/hcaptcha.ts
@@ -15,7 +15,9 @@ export const validateHCaptchaResponse = async (
         const { success } = await result.json();
 
         return success;
-    } catch {}
+    } catch (error) {
+        console.error("Failed to request hCaptcha /siteverify endpoint", error);
+    }
 
     return false;
 }
diff --git a/modules/captcha/utils/providers/turnstile.ts b/modules/captcha/utils/providers/turnstile.ts
@@ -15,7 +15,9 @@ export const validateCFTurnstileResponse = async (
         const { success } = await result.json();
 
         return success;
-    } catch {}
+    } catch (error) {
+        console.error("Failed to request hCaptcha /siteverify endpoint", error);
+    }
 
     return false;
 }
diff --git a/modules/eos/README.md b/modules/eos/README.md
diff --git a/modules/eos/module.json b/modules/eos/module.json
diff --git a/modules/idem/README.md b/modules/idem/README.md
diff --git a/modules/idem/module.json b/modules/idem/module.json
diff --git a/modules/identities/module.json b/modules/identities/module.json
@@ -5,7 +5,8 @@
   "tags": [
     "core",
     "user",
-    "auth"
+    "auth",
+    "internal"
   ],
   "authors": [
     "rivet-gg",

diff --git a/modules/lobbies/module.json b/modules/lobbies/module.json
@@ -65,7 +65,7 @@
     "list_regions": {
       "name": "List Regions",
       "description": "List available regions.",
-      "public": false
+      "public": true
     },
     "fetch_lobby_manager_state": {
       "name": "Fetch Lobby Manager State",

diff --git a/modules/lobbies/scripts/list.ts b/modules/lobbies/scripts/list.ts
@@ -19,6 +19,10 @@ interface LobbyListEntry {
 	id: string;
   version: string;
   tags: Record<string, string>;
+  createdAt: string;
+  players: number;
+  maxPlayers: number;
+  maxPlayersDirect: number;
 }
 
 export async function run(
@@ -46,11 +50,11 @@ export async function run(
     id: lobby.id,
     version: lobby.version,
     tags: lobby.tags,
-    createdAt: lobby.createdAt,
+    createdAt: new Date(lobby.createdAt).toISOString(),
     players: lobby.players,
     maxPlayers: lobby.maxPlayers,
     maxPlayersDirect: lobby.maxPlayersDirect,
-  }));
+  } satisfies LobbyListEntry));
 
 	return { lobbies: lobbyList };
 }