From 885029c7ccc1fc8225412caf45bc7136a4d5da11 Mon Sep 17 00:00:00 2001
From: Cody Maffucci <46459665+Maffooch@users.noreply.github.com>
Date: Sun, 15 Sep 2024 20:31:47 -0500
Subject: [PATCH] JSON Parsing Errors: Make errors less verbose (#10891)

* JSON Parsing Errors: Make errors less verbose

* Only intercept when JSON is invalid
---
 dojo/api_v2/exception_handler.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dojo/api_v2/exception_handler.py b/dojo/api_v2/exception_handler.py
index 513c98004b7..8f395026b03 100644
--- a/dojo/api_v2/exception_handler.py
+++ b/dojo/api_v2/exception_handler.py
@@ -2,6 +2,7 @@
 
 from django.core.exceptions import ValidationError
 from django.db.models.deletion import RestrictedError
+from rest_framework.exceptions import ParseError
 from rest_framework.response import Response
 from rest_framework.status import (
     HTTP_400_BAD_REQUEST,
@@ -20,7 +21,11 @@ def custom_exception_handler(exc, context):
     # to get the standard error response.
     response = exception_handler(exc, context)
 
-    if isinstance(exc, RestrictedError):
+    if isinstance(exc, ParseError) and "JSON parse error" in str(exc):
+        response = Response()
+        response.status_code = HTTP_400_BAD_REQUEST
+        response.data = {"message": "JSON request content is malformed"}
+    elif isinstance(exc, RestrictedError):
         # An object cannot be deleted because it has dependent objects.
         response = Response()
         response.status_code = HTTP_409_CONFLICT