Only use stack traces from actual Errors

directus · May 3, 2024 · ffb7eea · ffb7eea
1 parent 236c6a9
commit ffb7eea
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/api/src/middleware/error-handler.ts b/api/src/middleware/error-handler.ts
@@ -5,6 +5,7 @@ import type { ErrorRequestHandler, NextFunction, Request, Response } from 'expre
 import getDatabase from '../database/index.js';
 import emitter from '../emitter.js';
 import { useLogger } from '../logger.js';
+import type { DeepPartial } from '@directus/types';
 
 type ApiError = {
 	message: string;
@@ -32,14 +33,9 @@ export const errorHandler = asyncErrorHandler(async (err, req, res) => {
 	const receivedErrors: unknown[] = Array.isArray(err) ? err : [err];
 
 	for (const error of receivedErrors) {
-		if (getNodeEnv() === 'development') {
-			// If available, expose stack trace under error's extensions data
-			if (isObject(error) && error['stack'] && (error['extensions'] === undefined || isObject(error['extensions']))) {
-				error['extensions'] = {
-					...error['extensions'],
-					stack: error['stack'],
-				};
-			}
+		// In dev mode, if available, expose stack trace under error's extensions data
+		if (getNodeEnv() === 'development' && error instanceof Error && error.stack) {
+			((error as DeepPartial<ApiError>).extensions ??= {})['stack'] = error.stack;
 		}
 
 		if (isDirectusError(error)) {