Skip to content

Open-source status page, incident response and uptime monitoring

fix: silence bot bad_request (#2071)

Maximilian Kaske3bba288680eb
diff --git a/apps/server/src/routes/v1/monitors/results/get.test.ts b/apps/server/src/routes/v1/monitors/results/get.test.ts
index ebe4940b9..8af4d060b 100644
--- a/apps/server/src/routes/v1/monitors/results/get.test.ts
+++ b/apps/server/src/routes/v1/monitors/results/get.test.ts
@@ -78,7 +78,7 @@ test.todo(
);
test("get monitor result with non-matching result id should return 404", async () => {
- const res = await app.request("/v1/monitor/1/result/2", {
+ const res = await app.request("/v1/monitor/1/result/999998", {
method: "GET",
headers: {
"x-openstatus-key": "1",
diff --git a/apps/server/src/routes/v1/monitors/results/get.ts b/apps/server/src/routes/v1/monitors/results/get.ts
index a75829fec..6d3df3cfd 100644
--- a/apps/server/src/routes/v1/monitors/results/get.ts
+++ b/apps/server/src/routes/v1/monitors/results/get.ts
@@ -74,12 +74,19 @@ export function registerGetMonitorResult(api: typeof monitorsApi) {
}
// Fetch result from tb pipe
- const data = await tb.getResultForOnDemandCheckHttp({
- monitorId: _monitor.id,
- timestamp: _monitorRun.runnedAt?.getTime(),
- url: _monitor.url,
- });
+ try {
+ const data = await tb.getResultForOnDemandCheckHttp({
+ monitorId: _monitor.id,
+ timestamp: _monitorRun.runnedAt?.getTime(),
+ url: _monitor.url,
+ });
- return c.json(data.data, 200);
+ return c.json(data.data, 200);
+ } catch {
+ throw new OpenStatusApiError({
+ code: "INTERNAL_SERVER_ERROR",
+ message: `Failed to fetch result data for monitor run ${resultId}`,
+ });
+ }
});
}
diff --git a/apps/status-page/src/app/api/trpc/edge/[trpc]/route.ts b/apps/status-page/src/app/api/trpc/edge/[trpc]/route.ts
index 4d07aa311..cf4f2382b 100644
--- a/apps/status-page/src/app/api/trpc/edge/[trpc]/route.ts
+++ b/apps/status-page/src/app/api/trpc/edge/[trpc]/route.ts
@@ -2,6 +2,7 @@ import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
import type { NextRequest } from "next/server";
import { auth } from "@/lib/auth";
+import { createOnError } from "@/lib/trpc/shared";
import { createTRPCContext } from "@openstatus/api";
import { edgeRouter } from "@openstatus/api/src/edge";
@@ -13,24 +14,7 @@ const handler = (req: NextRequest) =>
router: edgeRouter,
req: req,
createContext: () => createTRPCContext({ req, auth }),
- onError: ({ error, path, input, type }) => {
- console.log("Error in tRPC handler (edge)");
- // TEMP: extra diagnostic context to trace malformed tRPC batch calls
- console.error({
- path,
- type,
- input,
- url: req.url,
- method: req.method,
- userAgent: req.headers.get("user-agent"),
- referer: req.headers.get("referer"),
- trpcSource: req.headers.get("x-trpc-source"),
- secFetchSite: req.headers.get("sec-fetch-site"),
- secFetchMode: req.headers.get("sec-fetch-mode"),
- secFetchDest: req.headers.get("sec-fetch-dest"),
- });
- console.error(error);
- },
+ onError: createOnError(req, "edge"),
});
export { handler as GET, handler as POST };
diff --git a/apps/status-page/src/app/api/trpc/lambda/[trpc]/route.ts b/apps/status-page/src/app/api/trpc/lambda/[trpc]/route.ts
index 1352dcf0c..416a78262 100644
--- a/apps/status-page/src/app/api/trpc/lambda/[trpc]/route.ts
+++ b/apps/status-page/src/app/api/trpc/lambda/[trpc]/route.ts
@@ -2,6 +2,7 @@ import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
import type { NextRequest } from "next/server";
import { auth } from "@/lib/auth";
+import { createOnError } from "@/lib/trpc/shared";
import { createTRPCContext } from "@openstatus/api";
import { lambdaRouter } from "@openstatus/api/src/lambda";
@@ -14,10 +15,7 @@ const handler = (req: NextRequest) =>
router: lambdaRouter,
req: req,
createContext: () => createTRPCContext({ req, auth }),
- onError: ({ error }) => {
- console.log("Error in tRPC handler (lambda)");
- console.error(error);
- },
+ onError: createOnError(req, "lambda"),
});
export { handler as GET, handler as POST };
diff --git a/apps/status-page/src/lib/trpc/shared.ts b/apps/status-page/src/lib/trpc/shared.ts
index 133fa3954..c5dd92c2f 100644
--- a/apps/status-page/src/lib/trpc/shared.ts
+++ b/apps/status-page/src/lib/trpc/shared.ts
@@ -1,9 +1,28 @@
import type { HTTPBatchLinkOptions, HTTPHeaders, TRPCLink } from "@trpc/client";
import { httpBatchLink } from "@trpc/client";
+import type { TRPCError } from "@trpc/server";
import type { AppRouter } from "@openstatus/api";
import superjson from "superjson";
+/**
+ * Shared onError handler for tRPC route handlers.
+ * Ignores input validation errors from external traffic (bots/crawlers)
+ * hitting the tRPC endpoint with malformed batch URLs.
+ * Our tRPC clients always set `x-trpc-source`; its absence means the
+ * request didn't come from our app. Only suppresses BAD_REQUEST so that
+ * other error types (UNAUTHORIZED, INTERNAL_SERVER_ERROR, etc.) are
+ * still logged regardless of source.
+ */
+export function createOnError(req: Request, label: string) {
+ return ({ error }: { error: TRPCError }) => {
+ if (error.code === "BAD_REQUEST" && !req.headers.get("x-trpc-source"))
+ return;
+ console.log(`Error in tRPC handler (${label})`);
+ console.error(error);
+ };
+}
+
const getBaseUrl = () => {
if (typeof window !== "undefined") return "";
// Note: status-page has its own tRPC API routes