From a5ff765f3b110149316f0639a6fcc6b34c3d708c Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Wed, 18 Feb 2015 15:57:05 -0500 Subject: [PATCH] Validate that we have a valid JSON body --- data/model/legacy.py | 3 +-- endpoints/api/__init__.py | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/data/model/legacy.py b/data/model/legacy.py index 13b4b9471..1e1e6c624 100644 --- a/data/model/legacy.py +++ b/data/model/legacy.py @@ -166,8 +166,7 @@ def _create_user(username, email): pass try: - new_user = User.create(username=username, email=email) - return new_user + return User.create(username=username, email=email) except Exception as ex: raise DataModelException(ex.message) diff --git a/endpoints/api/__init__.py b/endpoints/api/__init__.py index 377834002..0252851a1 100644 --- a/endpoints/api/__init__.py +++ b/endpoints/api/__init__.py @@ -334,7 +334,11 @@ def validate_json_request(schema_name): def wrapped(self, *args, **kwargs): schema = self.schemas[schema_name] try: - validate(request.get_json(), schema) + json_data = request.get_json() + if json_data is None: + raise InvalidRequest('Missing JSON body') + + validate(json_data, schema) return func(self, *args, **kwargs) except ValidationError as ex: raise InvalidRequest(ex.message)