From f5b5150cf3e560d13292c6e1351745bfeac8a6f4 Mon Sep 17 00:00:00 2001 From: Alex van Andel Date: Wed, 17 Aug 2022 00:38:26 +0100 Subject: [PATCH] Hotfix/dos mitigation attempt error configuration (#3879) * Fixes 'Task timed out after 60.03 seconds' * DDoS rewrite fixes Co-authored-by: zomars --- apps/web/next.config.js | 7 ++++--- apps/web/pages/auth/error.tsx | 13 ++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/web/next.config.js b/apps/web/next.config.js index 7f273e055f..bb1b38a732 100644 --- a/apps/web/next.config.js +++ b/apps/web/next.config.js @@ -141,9 +141,10 @@ const nextConfig = { source: "/api/auth/:path*", has: [ { - type: "header", - key: "User-Agent", - value: "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)", + type: "query", + key: "callbackUrl", + // prettier-ignore + value: "^(?!https?:\/\/).*$", }, ], destination: "/404", diff --git a/apps/web/pages/auth/error.tsx b/apps/web/pages/auth/error.tsx index df6aa2f528..bfb363e919 100644 --- a/apps/web/pages/auth/error.tsx +++ b/apps/web/pages/auth/error.tsx @@ -1,15 +1,14 @@ -import { GetServerSidePropsContext } from "next"; +import { GetStaticPropsContext } from "next"; import Link from "next/link"; import { useRouter } from "next/router"; +import { useLocale } from "@calcom/lib/hooks/useLocale"; import Button from "@calcom/ui/Button"; import { Icon } from "@calcom/ui/Icon"; -import { useLocale } from "@lib/hooks/useLocale"; - import AuthContainer from "@components/ui/AuthContainer"; -import { ssrInit } from "@server/lib/ssr"; +import { ssgInit } from "@server/lib/ssg"; export default function Error() { const { t } = useLocale(); @@ -40,12 +39,12 @@ export default function Error() { ); } -export async function getServerSideProps(context: GetServerSidePropsContext) { - const ssr = await ssrInit(context); +export const getStaticProps = async (context: GetStaticPropsContext) => { + const ssr = await ssgInit(context); return { props: { trpcState: ssr.dehydrate(), }, }; -} +};