Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
🔒️ Log identifiers when rate limits are hit (#1599)
Luke Vellab214de75abbc
diff --git a/apps/web/src/app/api/trpc/[trpc]/route.ts b/apps/web/src/app/api/trpc/[trpc]/route.tsindex 5c69ef06a..91d06db74 100644--- a/apps/web/src/app/api/trpc/[trpc]/route.ts+++ b/apps/web/src/app/api/trpc/[trpc]/route.ts@@ -9,13 +9,16 @@ import type { TRPCContext } from "@/trpc/context";import { appRouter } from "@/trpc/routers";import { getEmailClient } from "@/utils/emails";-const handler = (req: NextRequest) => {+const handler = async (req: NextRequest) => {+ const session = await auth();+ const ip = ipAddress(req);+ const ja4Digest = req.headers.get("x-vercel-ja4-digest");+return fetchRequestHandler({endpoint: "/api/trpc",req,router: appRouter,createContext: async () => {- const session = await auth();const locale = await getLocaleFromHeader(req);const user = session?.user? {@@ -31,8 +34,7 @@ const handler = (req: NextRequest) => {const ip =process.env.NODE_ENV === "development" ? "127.0.0.1" : ipAddress(req);- const identifier =- session?.user?.id ?? req.headers.get("x-vercel-ja4-digest") ?? ip;+ const identifier = session?.user?.id ?? ja4Digest ?? ip;return {user,@@ -44,6 +46,14 @@ const handler = (req: NextRequest) => {if (error.code === "INTERNAL_SERVER_ERROR") {Sentry.captureException(error);}+ if (error.code === "TOO_MANY_REQUESTS") {+ console.warn("Too many requests", {+ path: req.nextUrl.pathname,+ userId: session?.user?.id,+ ip,+ ja4Digest,+ });+ }},});};diff --git a/apps/web/src/trpc/trpc.ts b/apps/web/src/trpc/trpc.tsindex 7c50efef7..5f01c5228 100644--- a/apps/web/src/trpc/trpc.ts+++ b/apps/web/src/trpc/trpc.ts@@ -114,12 +114,6 @@ export const createRateLimitMiddleware = (const res = await ratelimit.limit(`${name}:${ctx.identifier}`);if (!res.success) {- console.warn("Rate limit exceeded", {- identifier: ctx.identifier,- endpoint: name,- limit: requests,- duration,- });throw new TRPCError({code: "TOO_MANY_REQUESTS",message: "Too many requests",