diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts index 602bc1b1e4..0b17f5ff61 100644 --- a/apps/web/middleware.ts +++ b/apps/web/middleware.ts @@ -1,22 +1,14 @@ import { get } from "@vercel/edge-config"; import { collectEvents } from "next-collect/server"; import type { NextMiddleware } from "next/server"; -import { NextResponse, userAgent } from "next/server"; +import { NextResponse } from "next/server"; -import { CONSOLE_URL, WEBAPP_URL, WEBSITE_URL } from "@calcom/lib/constants"; -import { isIpInBanlist } from "@calcom/lib/getIP"; import { extendEventData, nextCollectBasicSettings } from "@calcom/lib/telemetry"; const middleware: NextMiddleware = async (req) => { const url = req.nextUrl; const requestHeaders = new Headers(req.headers); - if (isIpInBanlist(req) && url.pathname !== "/api/nope") { - // DDOS Prevention: Immediately end request with no response - Avoids a redirect as well initiated by NextAuth on invalid callback - req.nextUrl.pathname = "/api/nope"; - return NextResponse.redirect(req.nextUrl); - } - if (!url.pathname.startsWith("/api")) { // // NOTE: When tRPC hits an error a 500 is returned, when this is received @@ -39,21 +31,6 @@ const middleware: NextMiddleware = async (req) => { } } - if (["/api/collect-events", "/api/auth"].some((p) => url.pathname.startsWith(p))) { - const callbackUrl = url.searchParams.get("callbackUrl"); - const { isBot } = userAgent(req); - - if ( - isBot || - (callbackUrl && ![CONSOLE_URL, WEBAPP_URL, WEBSITE_URL].some((u) => callbackUrl.startsWith(u))) || - isIpInBanlist(req) - ) { - // DDOS Prevention: Immediately end request with no response - Avoids a redirect as well initiated by NextAuth on invalid callback - req.nextUrl.pathname = "/api/nope"; - return NextResponse.redirect(req.nextUrl); - } - } - const res = routingForms.handle(url); if (res) { return res; @@ -96,13 +73,9 @@ export const config = { // Next.js Doesn't support spread operator in config matcher, so, we must list all paths explicitly here. // https://github.com/vercel/next.js/discussions/42458 matcher: [ - "/((?!_next|.*avatar.png$|favicon.ico$).*)", - "/api/collect-events/:path*", - "/api/auth/:path*", "/:path*/embed", "/api/trpc/:path*", "/auth/login", - /** * Paths required by routingForms.handle */