Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
🎨 Add rate-limit middleware for trpc (#1291)
Luke Vella94fd0ae7a449
diff --git a/packages/backend/trpc/routers/auth.ts b/packages/backend/trpc/routers/auth.tsindex 755025398..e743fd0ef 100644--- a/packages/backend/trpc/routers/auth.ts+++ b/packages/backend/trpc/routers/auth.ts@@ -1,15 +1,14 @@import { prisma } from "@rallly/database";-import { TRPCError } from "@trpc/server";import { z } from "zod";import { createToken, decryptToken } from "../../session";import { generateOtp } from "../../utils/nanoid";-import { publicProcedure, router } from "../trpc";+import { publicProcedure, rateLimitMiddleware, router } from "../trpc";import { RegistrationTokenPayload } from "../types";export const auth = router({- // @deprecatedrequestRegistration: publicProcedure+ .use(rateLimitMiddleware).input(z.object({name: z.string().nonempty().max(100),@@ -24,14 +23,6 @@ export const auth = router({| { ok: true; token: string }| { ok: false; reason: "userAlreadyExists" | "emailNotAllowed" }> => {- const { success } = await ctx.ratelimit();- if (!success) {- throw new TRPCError({- code: "TOO_MANY_REQUESTS",- message: "Too many requests",- });- }-if (ctx.isEmailBlocked?.(input.email)) {return { ok: false, reason: "emailNotAllowed" };}diff --git a/packages/backend/trpc/routers/polls.ts b/packages/backend/trpc/routers/polls.tsindex 3f14ebb9c..3473ee5fc 100644--- a/packages/backend/trpc/routers/polls.ts+++ b/packages/backend/trpc/routers/polls.ts@@ -11,6 +11,7 @@ import {possiblyPublicProcedure,proProcedure,publicProcedure,+ rateLimitMiddleware,router,} from "../trpc";import { comments } from "./polls/comments";@@ -148,6 +149,7 @@ export const polls = router({// START LEGACY ROUTEScreate: possiblyPublicProcedure+ .use(rateLimitMiddleware).input(z.object({title: z.string().trim().min(1),diff --git a/packages/backend/trpc/routers/polls/participants.ts b/packages/backend/trpc/routers/polls/participants.tsindex fe1cb5167..a2556ca3d 100644--- a/packages/backend/trpc/routers/polls/participants.ts+++ b/packages/backend/trpc/routers/polls/participants.ts@@ -4,7 +4,7 @@ import { waitUntil } from "@vercel/functions";import { z } from "zod";import { createToken } from "../../../session";-import { publicProcedure, router } from "../../trpc";+import { publicProcedure, rateLimitMiddleware, router } from "../../trpc";import { DisableNotificationsPayload } from "../../types";export const participants = router({@@ -55,6 +55,7 @@ export const participants = router({});}),add: publicProcedure+ .use(rateLimitMiddleware).input(z.object({pollId: z.string(),@@ -69,14 +70,6 @@ export const participants = router({}),).mutation(async ({ ctx, input: { pollId, votes, name, email } }) => {- const { success } = await ctx.ratelimit();-- if (!success) {- throw new TRPCError({- code: "TOO_MANY_REQUESTS",- message: "Rate limit exceeded. Please try again later.",- });- }const { user } = ctx;const poll = await prisma.poll.findUnique({diff --git a/packages/backend/trpc/trpc.ts b/packages/backend/trpc/trpc.tsindex 44056987f..24cd1c009 100644--- a/packages/backend/trpc/trpc.ts+++ b/packages/backend/trpc/trpc.ts@@ -70,4 +70,15 @@ export const privateProcedure = t.procedure.use(}),);+export const rateLimitMiddleware = middleware(async ({ ctx, next }) => {+ const { success } = await ctx.ratelimit();+ if (!success) {+ throw new TRPCError({+ code: "TOO_MANY_REQUESTS",+ message: "Too many requests",+ });+ }+ return next();+});+export const mergeRouters = t.mergeRouters;