Skip to content

A self-hostable bookmark-everything app (links, notes and images) with AI-based automatic tagging and full text search

fix: redact internal server errors in prod responses

Mohamed Bassemc8a75a0bc310
diff --git a/packages/api/middlewares/trpcAdapter.ts b/packages/api/middlewares/trpcAdapter.ts
index ced2539a..3f73663c 100644
--- a/packages/api/middlewares/trpcAdapter.ts
+++ b/packages/api/middlewares/trpcAdapter.ts
@@ -33,9 +33,11 @@ const trpcAdapter = createMiddleware(async (c, next) => {
const e = c.error;
if (e instanceof TRPCError) {
const code = trpcCodeToHttpCode(e.code);
+ const isInternalError = e.code === "INTERNAL_SERVER_ERROR";
+ const isProd = process.env.NODE_ENV === "production";
throw new HTTPException(code, {
- message: e.message,
- cause: e.cause,
+ message: isInternalError && isProd ? "Internal server error" : e.message,
+ cause: isInternalError && isProd ? undefined : e.cause,
});
}
});
diff --git a/packages/api/routes/trpc.ts b/packages/api/routes/trpc.ts
index fd3ed312..20e18a1f 100644
--- a/packages/api/routes/trpc.ts
+++ b/packages/api/routes/trpc.ts
@@ -1,6 +1,7 @@
import { trpcServer } from "@hono/trpc-server";
import { Hono } from "hono";
+import logger from "@karakeep/shared/logger";
import { Context } from "@karakeep/trpc";
import { appRouter } from "@karakeep/trpc/routers/_app";
@@ -17,9 +18,11 @@ const trpc = new Hono<{
return c.var.ctx;
},
onError: ({ path, error }) => {
- if (process.env.NODE_ENV === "development") {
- console.error(`❌ tRPC failed on ${path}`);
- console.error(error);
+ if (error.code === "INTERNAL_SERVER_ERROR") {
+ logger.error(`tRPC failed on ${path}: ${error.message}`);
+ if (error.stack) {
+ logger.error(error.stack);
+ }
}
},
}),
diff --git a/packages/trpc/index.ts b/packages/trpc/index.ts
index 178703f0..ab9604ef 100644
--- a/packages/trpc/index.ts
+++ b/packages/trpc/index.ts
@@ -51,6 +51,11 @@ const t = initTRPC.context<Context>().create({
});
return {
...shape,
+ message:
+ error.code === "INTERNAL_SERVER_ERROR" &&
+ process.env.NODE_ENV === "production"
+ ? "Internal server error"
+ : shape.message,
data: {
...shape.data,
zodError: