From ea99ac002475baa64a4c273e800f7e55717f5229 Mon Sep 17 00:00:00 2001
From: Abimael Martell <abimex@gmail.com>
Date: Mon, 19 Jan 2026 14:36:48 -0800
Subject: [PATCH] Don't Expose Internal Errors (#2700)

* Don't Expose Internal Errors

* log to sentry

* dont duplicate
---
 apps/api/src/controllers/v1/scrape.ts | 37 +++++++++++++++++++------
 apps/api/src/controllers/v2/scrape.ts | 39 +++++++++++++++++++++------
 2 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/apps/api/src/controllers/v1/scrape.ts b/apps/api/src/controllers/v1/scrape.ts
index 6e9e57c28..20c43a701 100644
--- a/apps/api/src/controllers/v1/scrape.ts
+++ b/apps/api/src/controllers/v1/scrape.ts
@@ -20,6 +20,8 @@ import { processJobInternal } from "../../services/worker/scrape-worker";
 import { ScrapeJobData } from "../../types";
 import { AbortManagerThrownError } from "../../scraper/scrapeURL/lib/abortManager";
 import { logRequest } from "../../services/logging/log_job";
+import { getErrorContactMessage } from "../../lib/deployment";
+import { captureExceptionWithZdrCheck } from "../../services/sentry";
 
 export async function scrapeController(
   req: RequestWithAuth<{}, ScrapeResponse, ScrapeRequest>,
@@ -175,14 +177,13 @@ export async function scrapeController(
     const timeoutErr =
       e instanceof TransportableError && e.code === "SCRAPE_TIMEOUT";
 
-    if (!timeoutErr) {
-      logger.error(`Error in scrapeController`, {
-        version: "v1",
-        error: e,
-      });
-    }
-
     if (e instanceof TransportableError) {
+      if (!timeoutErr) {
+        logger.error(`Error in scrapeController`, {
+          version: "v1",
+          error: e,
+        });
+      }
       // DNS resolution errors should return 200 with success: false
       if (e.code === "SCRAPE_DNS_RESOLUTION_ERROR") {
         return res.status(200).json({
@@ -198,10 +199,30 @@ export async function scrapeController(
         error: e.message,
       });
     } else {
+      const id = uuidv7();
+      logger.error(`Error in scrapeController`, {
+        version: "v1",
+        error: e,
+        errorId: id,
+        path: req.path,
+        teamId: req.auth.team_id,
+      });
+      captureExceptionWithZdrCheck(e, {
+        tags: {
+          errorId: id,
+          version: "v1",
+          teamId: req.auth.team_id,
+        },
+        extra: {
+          path: req.path,
+          url: req.body.url,
+        },
+        zeroDataRetention,
+      });
       return res.status(500).json({
         success: false,
         code: "UNKNOWN_ERROR",
-        error: `(Internal server error) - ${e && e.message ? e.message : e}`,
+        error: getErrorContactMessage(id),
       });
     }
   } finally {
diff --git a/apps/api/src/controllers/v2/scrape.ts b/apps/api/src/controllers/v2/scrape.ts
index a59599255..033d5a6db 100644
--- a/apps/api/src/controllers/v2/scrape.ts
+++ b/apps/api/src/controllers/v2/scrape.ts
@@ -20,6 +20,8 @@ import { ScrapeJobData } from "../../types";
 import { teamConcurrencySemaphore } from "../../services/worker/team-semaphore";
 import { getJobPriority } from "../../lib/job-priority";
 import { logRequest } from "../../services/logging/log_job";
+import { getErrorContactMessage } from "../../lib/deployment";
+import { captureExceptionWithZdrCheck } from "../../services/sentry";
 
 export async function scrapeController(
   req: RequestWithAuth<{}, ScrapeResponse, ScrapeRequest>,
@@ -258,13 +260,6 @@ export async function scrapeController(
         const timeoutErr =
           e instanceof TransportableError && e.code === "SCRAPE_TIMEOUT";
 
-        if (!timeoutErr) {
-          logger.error(`Error in scrapeController`, {
-            version: "v2",
-            error: e,
-          });
-        }
-
         setSpanAttributes(span, {
           "scrape.error": e instanceof Error ? e.message : String(e),
           "scrape.error_type":
@@ -272,6 +267,12 @@ export async function scrapeController(
         });
 
         if (e instanceof TransportableError) {
+          if (!timeoutErr) {
+            logger.error(`Error in scrapeController`, {
+              version: "v2",
+              error: e,
+            });
+          }
           // DNS resolution errors should return 200 with success: false
           if (e.code === "SCRAPE_DNS_RESOLUTION_ERROR") {
             setSpanAttributes(span, {
@@ -305,12 +306,34 @@ export async function scrapeController(
             error: e.message,
           });
         } else {
+          const id = uuidv7();
+          logger.error(`Error in scrapeController`, {
+            version: "v2",
+            error: e,
+            errorId: id,
+            path: req.path,
+            teamId: req.auth.team_id,
+          });
+          captureExceptionWithZdrCheck(e, {
+            tags: {
+              errorId: id,
+              version: "v2",
+              teamId: req.auth.team_id,
+            },
+            extra: {
+              path: req.path,
+              url: req.body.url,
+            },
+            zeroDataRetention,
+          });
           setSpanAttributes(span, {
             "scrape.status_code": 500,
+            "scrape.error_id": id,
           });
           return res.status(500).json({
             success: false,
-            error: `(Internal server error) - ${e && e.message ? e.message : e}`,
+            code: "UNKNOWN_ERROR",
+            error: getErrorContactMessage(id),
           });
         }
       } finally {