@lucaapp/service-utils 5.43.0 → 5.44.0

package/dist/lib/errorReporting/index.d.ts

@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/node';
-import type { ErrorRequestHandler } from 'express';
+import type { ErrorRequestHandler, RequestHandler } from 'express';
 export type ErrorReportingOptions = {
     dsn?: string;
     serviceName: string;
@@ -20,5 +20,6 @@ export declare const isErrorReportingEnabled: () => boolean;
 export declare const statusOf: (error: unknown) => number;
 export declare const captureServerError: (error: unknown, context?: ServerErrorContext) => void;
 export declare const errorReportingHandler: ErrorRequestHandler;
+export declare const errorReportingMiddleware: RequestHandler;
 export declare const exitAfterReport: (error: unknown) => void;
 export declare const closeErrorReporting: () => Promise<void>;

package/dist/lib/errorReporting/index.js

@@ -33,14 +33,29 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.closeErrorReporting = exports.exitAfterReport = exports.errorReportingHandler = exports.captureServerError = exports.statusOf = exports.isErrorReportingEnabled = exports.initErrorReporting = exports.scrubEvent = exports.scrubValue = exports.scrubString = void 0;
+exports.closeErrorReporting = exports.exitAfterReport = exports.errorReportingMiddleware = exports.errorReportingHandler = exports.captureServerError = exports.statusOf = exports.isErrorReportingEnabled = exports.initErrorReporting = exports.scrubEvent = exports.scrubValue = exports.scrubString = void 0;
 const Sentry = __importStar(require("@sentry/node"));
 const boom_1 = require("@hapi/boom");
 const DEFAULT_FLUSH_TIMEOUT_MS = 800;
 const MAX_DEPTH = 8;
+// Bounds regex backtracking in beforeSend.
+const MAX_STRING_LENGTH = 4096;
 const FILTERED = '[Filtered]';
-const SENSITIVE_KEY = /auth|cookie|token|secret|passw|passcode|^pin$|session|e-?mail|phone|iban|card|(^|_)pan($|_|number)|cvc|cvv|shopper|reservation|booking|confirmation|(^|_)name$|surname|(first|last|full|guest|holder)_?name|address|birth|passport|signature|tax_?id|vat|api_?key/i;
+const SENSITIVE_KEY = /auth|cookie|token|secret|passw|passcode|^pin$|session|e-?mail|phone|iban|card|(^|_)pan($|_|number)|cvc|cvv|shopper|reservation|booking|confirmation|(^|_)name$|surname|(first|last|full|guest|holder|given|family)_?name|address|birth|^dob$|^ip$|passport|signature|tax_?id|vat|api_?key/i;
 const digitCount = (value) => value.replaceAll(/\D/g, '').length;
+const isLuhnValid = (digits) => {
+    let sum = 0;
+    for (let index = 0; index < digits.length; index += 1) {
+        let digit = Number(digits[digits.length - 1 - index]);
+        if (index % 2 === 1) {
+            digit *= 2;
+            if (digit > 9)
+                digit -= 9;
+        }
+        sum += digit;
+    }
+    return sum % 10 === 0;
+};
 const STRING_PATTERNS = [
     [/eyJ[\w-]+\.[\w-]+\.[\w-]+(?:\.[\w-]+\.[\w-]+)?/g, () => '[jwt]'],
     [
@@ -55,15 +70,17 @@ const STRING_PATTERNS = [
     [
         /\d[\d -]{11,}\d/g,
         match => {
-            const digits = digitCount(match);
-            return digits >= 13 && digits <= 19 ? '[number]' : match;
+            const digits = match.replaceAll(/\D/g, '');
+            return digits.length >= 13 && digits.length <= 19 && isLuhnValid(digits)
+                ? '[number]'
+                : match;
         },
     ],
 ];
 let enabled = false;
 let flushTimeoutMs = DEFAULT_FLUSH_TIMEOUT_MS;
 const scrubString = (value) => {
-    let result = value;
+    let result = value.slice(0, MAX_STRING_LENGTH);
     for (const [pattern, replacement] of STRING_PATTERNS) {
         result = result.replace(pattern, replacement);
     }
@@ -137,6 +154,7 @@ const initErrorReporting = (options) => {
         release: options.release,
         serverName: options.serviceName,
         sendDefaultPii: false,
+        sendClientReports: false,
         skipOpenTelemetrySetup: true,
         defaultIntegrations: false,
         integrations: [
@@ -193,6 +211,34 @@ const errorReportingHandler = (error, request, _response, next) => {
     next(error);
 };
 exports.errorReportingHandler = errorReportingHandler;
+// Mount first: service-utils endpoints answer 5xx themselves and only set
+// response.err, so the decision is made on the status actually sent.
+const errorReportingMiddleware = (request, response, next) => {
+    if (enabled) {
+        let reported = false;
+        const report = () => {
+            if (reported || response.statusCode < 500)
+                return;
+            reported = true;
+            try {
+                Sentry.captureException(response.err ??
+                    new Error(`HTTP ${response.statusCode} ${request.method} ${routeOf(request)}`), {
+                    tags: {
+                        method: request.method,
+                        status: String(response.statusCode),
+                        route: routeOf(request),
+                        ...(request.id !== undefined && { reqId: String(request.id) }),
+                    },
+                });
+            }
+            catch { }
+        };
+        response.once('finish', report);
+        response.once('close', report);
+    }
+    next();
+};
+exports.errorReportingMiddleware = errorReportingMiddleware;
 const exitAfterReport = (error) => {
     if (enabled) {
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucaapp/service-utils",
-  "version": "5.43.0",
+  "version": "5.44.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -34,7 +34,7 @@
     "axios": "1.20.0",
     "axios-rate-limit": "^1.4.0",
     "axios-retry": "^4.5.0",
-    "body-parser": "1.20.6",
+    "body-parser": "1.20.9",
     "busboy": "^1.6.0",
     "cls-rtracer": "^2.6.3",
     "express": "4.22.1",
@@ -99,7 +99,7 @@
   },
   "resolutions": {
     "tar": "7.5.21",
-    "body-parser": "1.20.6",
+    "body-parser": "1.20.9",
     "lodash": "^4.18.1",
     "qs": "6.16.0",
     "dottie": "2.0.7",