odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] http.py: invalid request must return a status code 400

This commit is contained in:
Christophe Simonis 2014-11-20 16:06:55 +01:00
parent cd1eaabe11
commit 473fe9a331
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openerp/http.py
View File

@ -261,8 +261,8 @@ class WebRequest(object):
def _call_function(self, *args, **kwargs):
request = self
if self.endpoint.routing['type'] != self._request_type:
raise Exception("%s, %s: Function declared as capable of handling request of type '%s' but called with a request of type '%s'" \
% (self.endpoint.original, self.httprequest.path, self.endpoint.routing['type'], self._request_type))
raise werkzeug.exceptions.BadRequest("%s, %s: Function declared as capable of handling request of type '%s' but called with a request of type '%s'" %
(self.endpoint.original, self.httprequest.path, self.endpoint.routing['type'], self._request_type))
kwargs.update(self.endpoint.arguments)
@ -463,7 +463,11 @@ class JsonRequest(WebRequest):
request = self.httprequest.stream.read()
# Read POST content or POST Form Data named "request"
self.jsonrequest = simplejson.loads(request)
try:
self.jsonrequest = simplejson.loads(request)
except simplejson.JSONDecodeError:
raise werkzeug.exceptions.BadRequest('Invalid JSON data')
self.params = dict(self.jsonrequest.get("params", {}))
self.context = self.params.pop('context', dict(self.session.context))