@luckystack/server 0.3.0 → 0.4.0

package/dist/index.js

@@ -472,6 +472,40 @@ var handleAuthApiRoute = async ({
     return true;
   }
   if (login.isFullOAuthProvider(provider)) {
+    const oauthRateLimiting = config.rateLimiting;
+    const oauthRequesterIp = resolveClientIp({
+      rawAddress: req.socket.remoteAddress,
+      headers: req.headers,
+      trustProxy: config.http.trustProxy,
+      trustedProxyHopCount: config.http.trustedProxyHopCount
+    });
+    const oauthInitLimit = oauthRateLimiting.defaultApiLimit !== false && oauthRateLimiting.defaultApiLimit > 0 ? oauthRateLimiting.defaultApiLimit : oauthRateLimiting.auth.enabled && oauthRateLimiting.auth.maxAttempts > 0 ? oauthRateLimiting.auth.maxAttempts : null;
+    if (oauthInitLimit !== null) {
+      const oauthInitWindowMs = oauthRateLimiting.defaultApiLimit === false ? oauthRateLimiting.auth.windowMs : oauthRateLimiting.windowMs;
+      const { allowed, resetIn } = await checkRateLimit({
+        key: `ip:${oauthRequesterIp}:auth:oauth-init`,
+        limit: oauthInitLimit,
+        windowMs: oauthInitWindowMs
+      });
+      if (!allowed) {
+        void dispatchHook2("rateLimitExceeded", {
+          scope: "auth",
+          key: `ip:${oauthRequesterIp}:auth:oauth-init`,
+          limit: oauthInitLimit,
+          windowMs: oauthInitWindowMs,
+          count: oauthInitLimit + 1,
+          route: routePath,
+          ip: oauthRequesterIp
+        });
+        res.writeHead(429, { "content-type": "application/json; charset=utf-8" });
+        res.end(JSON.stringify({
+          status: false,
+          reason: "api.rateLimitExceeded",
+          errorParams: [{ key: "seconds", value: resetIn }]
+        }));
+        return true;
+      }
+    }
     const reqUrl = new URL(req.url ?? "/", "http://placeholder");
     const returnUrl = reqUrl.searchParams.get("return_url") ?? void 0;
     const oauthState = await login.createOAuthState(provider.name, { usePkce: provider.usePkce, returnUrl });
@@ -1419,8 +1453,7 @@ var executeRoomMutation = async (opts) => {
     return;
   }
   const existingRoomCodes = getSessionRoomCodes(session);
-  const roomPurpose = preHook === "preRoomJoin" ? "join" : "leave";
-  const physicalRoom = formatRoomName(group, { purpose: roomPurpose, userId: session.id });
+  const physicalRoom = formatRoomName(group, { purpose: "broadcast", userId: session.id });
   const nextRoomCodes = await mutate(socket, physicalRoom, group, existingRoomCodes, session.id);
   const sanitizedSession = sanitizeSessionRoomKeys(session);
   await writeSession(token, { ...sanitizedSession, roomCodes: nextRoomCodes });
@@ -1486,7 +1519,7 @@ var registerRoomEvents = (ctx) => {
               const oldest = kept[0];
               if (oldest === void 0) break;
               kept = kept.slice(1);
-              await sock.leave(formatRoomName(oldest, { purpose: "join", userId }));
+              await sock.leave(formatRoomName(oldest, { purpose: "broadcast", userId }));
             }
           }
           await sock.join(physicalRoom);
@@ -1637,7 +1670,7 @@ var rejoinPersistedRooms = (ctx) => {
       const roomCodes = session ? getSessionRoomCodes(session) : [];
       const userId = session?.id ?? null;
       for (const roomCode of roomCodes) {
-        await socket.join(formatRoomName(roomCode, { purpose: "join", userId }));
+        await socket.join(formatRoomName(roomCode, { purpose: "broadcast", userId }));
       }
       return roomCodes;
     });