summaryrefslogtreecommitdiffstats
path: root/keystone/common/wsgi.py
diff options
context:
space:
mode:
authorGuang Yee <guang.yee@hp.com>2013-01-08 08:46:20 -0800
committerGuang Yee <guang.yee@hp.com>2013-02-20 13:18:38 -0800
commit9f812939d4b05384b0a7d48e6b916baeca0477dc (patch)
treedda2e10abea730ab99955b3d595e60735b273a1f /keystone/common/wsgi.py
parentd036db145d51f8b134ffa36165065a8986e4f8a1 (diff)
downloadkeystone-9f812939d4b05384b0a7d48e6b916baeca0477dc.tar.gz
keystone-9f812939d4b05384b0a7d48e6b916baeca0477dc.tar.xz
keystone-9f812939d4b05384b0a7d48e6b916baeca0477dc.zip
v3 token API
Also implemented the following: blueprint pluggable-identity-authentication-handlers blueprint stop-ids-in-uris blueprint multi-factor-authn (just the plumbing) What's missing? * domain scoping (will be implemented by Henry?) Change-Id: I191c0b2cb3367b2a5f8a2dc674c284bb13ea97e3
Diffstat (limited to 'keystone/common/wsgi.py')
-rw-r--r--keystone/common/wsgi.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py
index 4c9a90bf..a515eefe 100644
--- a/keystone/common/wsgi.py
+++ b/keystone/common/wsgi.py
@@ -547,10 +547,11 @@ def render_response(body=None, status=None, headers=None):
def render_exception(error):
"""Forms a WSGI response based on the current error."""
- return render_response(status=(error.code, error.title), body={
- 'error': {
- 'code': error.code,
- 'title': error.title,
- 'message': str(error),
- }
- })
+ body = {'error': {
+ 'code': error.code,
+ 'title': error.title,
+ 'message': str(error)
+ }}
+ if isinstance(error, exception.AuthPluginException):
+ body['authentication'] = error.authentication
+ return render_response(status=(error.code, error.title), body=body)