Merge pull request #52 from felixnext/felixnext/24-06_fail-easy

Fail protobuf parsing easier
felixnext · Jun 26, 2024 · ecfc883 · ecfc883
2 parents c7a80a0 + 8ec1bbe
commit ecfc883
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/functown/__init__.py b/functown/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "2.3.0"
+__version__ = "2.3.1"
 
 import logging
 

diff --git a/functown/serialization/protobuf.py b/functown/serialization/protobuf.py
@@ -127,7 +127,13 @@ def deserialize(self, req: HttpRequest, *args, **kwargs) -> Any:
             if isinstance(body, str):
                 body = body.encode("utf-8")
             pb_item = self._pb_class()
-            json_format.Parse(body, pb_item)
+            # NOTE: this provides more graceful error handling
+            try:
+                json_format.Parse(body, pb_item)
+            except json_format.ParseError as e:
+                raise RequestError(f"Failed to parse JSON request: {str(e)}", 400)
+            except Exception as e:
+                raise RequestError(f"Error while parsing json body", 400)
             return pb_item
 
         # check for hard request