Spacebar/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2024-11-08 11:52:55 +01:00
Code Issues Releases Activity

Fix body-parser errors not being filtered in ErrorHandler middleware

Browse Source
This commit is contained in:
Madeline 2023-04-16 21:46:50 +10:00
parent 174d34c376
commit 164fcc25f3
No known key found for this signature in database
GPG Key ID: 1958E017C36F2E47
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
patches/body-parser+1.20.1.patch
View File

@ -1,5 +1,5 @@
diff --git a/node_modules/body-parser/lib/types/json.js b/node_modules/body-parser/lib/types/json.js
index c2745be..7104cfa 100644
index c2745be..17c2cfe 100644
--- a/node_modules/body-parser/lib/types/json.js
+++ b/node_modules/body-parser/lib/types/json.js
@@ -18,6 +18,7 @@ var createError = require('http-errors')
@ -28,3 +28,12 @@ index c2745be..7104cfa 100644
} catch (e) {
return normalizeJsonSyntaxError(e, {
message: e.message.replace('#', char),
@@ -216,7 +217,7 @@ function normalizeJsonSyntaxError (error, obj) {
}
// replace stack before message for Node.js 0.10 and below
- error.stack = obj.stack.replace(error.message, obj.message)
+ error.stack = obj.stack?.replace(error.message, obj.message)
error.message = obj.message
return error

7
src/api/middlewares/ErrorHandler.ts
View File

@ -22,7 +22,7 @@ import { ApiError, FieldError } from "@spacebar/util";
const EntityNotFoundErrorRegex = /"(\w+)"/;
export function ErrorHandler(
error: Error,
error: Error & { type?: string },
req: Request,
res: Response,
next: NextFunction,
@ -50,6 +50,11 @@ export function ErrorHandler(
code = Number(error.code);
message = error.message;
errors = error.errors;
} else if (error?.type == "entity.parse.failed") {
// body-parser failed
httpcode = 400;
code = 50109;
message = "The request body contains invalid JSON.";
} else {
console.error(
`[Error] ${code} ${req.url}\n`,