summaryrefslogtreecommitdiffstats
path: root/keystone/middleware
diff options
context:
space:
mode:
authortermie <github@anarkystic.com>2012-02-01 16:51:46 -0800
committertermie <github@anarkystic.com>2012-02-01 16:51:46 -0800
commit40525e0e52966454e75a4ba9ed689280caaaf61d (patch)
treea3e4f1f7cce651bde9c6fc6a2a39baaedd0b92c3 /keystone/middleware
parenta703983713306278ecee1c7cf993a5c5772e1035 (diff)
downloadkeystone-40525e0e52966454e75a4ba9ed689280caaaf61d.tar.gz
keystone-40525e0e52966454e75a4ba9ed689280caaaf61d.tar.xz
keystone-40525e0e52966454e75a4ba9ed689280caaaf61d.zip
be more safe with getting json aprams
Diffstat (limited to 'keystone/middleware')
-rw-r--r--keystone/middleware/core.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/keystone/middleware/core.py b/keystone/middleware/core.py
index 21e0f624..46d38673 100644
--- a/keystone/middleware/core.py
+++ b/keystone/middleware/core.py
@@ -89,9 +89,13 @@ class JsonBodyMiddleware(wsgi.Middleware):
if not params_json:
return
- params_parsed = json.loads(params_json)
- if not params_parsed:
- params_parsed = {}
+ params_parsed = {}
+ try:
+ params_parsed = json.loads(params_json)
+ finally:
+ if not params_parsed:
+ params_parsed = {}
+
params = {}
for k, v in params_parsed.iteritems():
if k in ('self', 'context'):