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 safe actions (#1836)
Luke Vellaf8bdfdd0670c
diff --git a/apps/web/src/features/feedback/actions.ts b/apps/web/src/features/feedback/actions.tsindex adaff2a6f..06f0721db 100644--- a/apps/web/src/features/feedback/actions.ts+++ b/apps/web/src/features/feedback/actions.ts@@ -1,24 +1,19 @@"use server";import { feedbackSchema } from "@/features/feedback/schema";-import { authActionClient } from "@/features/safe-action/server";+import {+ authActionClient,+ createRateLimitMiddleware,+} from "@/features/safe-action/server";import { getEmailClient } from "@/utils/emails";-import { rateLimit } from "../rate-limit";export const submitFeedbackAction = authActionClient.metadata({- actionName: "submitFeedback",+ actionName: "submit_feedback",})+ .use(createRateLimitMiddleware(5, "1 h")).inputSchema(feedbackSchema).action(async ({ ctx, parsedInput }) => {- const { success } = await rateLimit("submitFeedback", 3, "1h");-- if (!success) {- return {- error: "Rate limit exceeded" as const,- };- }-try {const { content } = parsedInput;getEmailClient().sendEmail({diff --git a/apps/web/src/features/rate-limit/index.ts b/apps/web/src/features/rate-limit/index.tsindex 4c3ba4231..d616f4093 100644--- a/apps/web/src/features/rate-limit/index.ts+++ b/apps/web/src/features/rate-limit/index.ts@@ -8,8 +8,8 @@ import { auth } from "@/next-auth";import { isRateLimitEnabled } from "./constants";-type Unit = "ms" | "s" | "m" | "h" | "d";-type Duration = `${number} ${Unit}` | `${number}${Unit}`;+export type Unit = "ms" | "s" | "m" | "h" | "d";+export type Duration = `${number} ${Unit}` | `${number}${Unit}`;async function getIPAddress() {return (await headers()).get("x-forwarded-for");diff --git a/apps/web/src/features/safe-action/client.ts b/apps/web/src/features/safe-action/client.tsindex 148861e50..ce85c31d6 100644--- a/apps/web/src/features/safe-action/client.ts+++ b/apps/web/src/features/safe-action/client.ts@@ -32,6 +32,11 @@ export const useSafeAction: typeof useAction = (action, options) => {defaultValue: "An internal server error occurred",});break;+ case "TOO_MANY_REQUESTS":+ translatedDescription = t("actionErrorTooManyRequests", {+ defaultValue: "You are making too many requests",+ });+ break;}toast.error(translatedDescription);diff --git a/apps/web/src/features/safe-action/server.ts b/apps/web/src/features/safe-action/server.tsindex 37fcfaed6..da582282f 100644--- a/apps/web/src/features/safe-action/server.ts+++ b/apps/web/src/features/safe-action/server.ts@@ -6,12 +6,15 @@ import { revalidatePath } from "next/cache";import { createMiddleware, createSafeActionClient } from "next-safe-action";import z from "zod";import { requireUserAbility } from "@/auth/queries";+import type { Duration } from "@/features/rate-limit";+import { rateLimit } from "@/features/rate-limit";type ActionErrorCode =| "UNAUTHORIZED"| "NOT_FOUND"| "FORBIDDEN"- | "INTERNAL_SERVER_ERROR";+ | "INTERNAL_SERVER_ERROR"+ | "TOO_MANY_REQUESTS";export class ActionError extends Error {code: ActionErrorCode;@@ -65,6 +68,29 @@ const posthogMiddleware = createMiddleware<{return result;});+export const createRateLimitMiddleware = (+ requests: number,+ duration: Duration,+) =>+ createMiddleware<{+ metadata: {+ actionName: string;+ };+ }>().define<{+ ctx: { user: { id: string } };+ }>(async ({ next, metadata }) => {+ const res = await rateLimit(metadata.actionName, requests, duration);++ if (!res.success) {+ throw new ActionError({+ code: "TOO_MANY_REQUESTS",+ message: "You are making too many requests.",+ });+ }++ return next();+ });+export const actionClient = createSafeActionClient({defineMetadataSchema: () =>z.object({