diff options
author | Jamie Lennox <jamielennox@gmail.com> | 2013-07-17 10:46:25 +1000 |
---|---|---|
committer | Jamie Lennox <jamielennox@gmail.com> | 2013-07-17 12:45:52 +1000 |
commit | 71edac1585fd3cf6333e8f642339ce63784d4f53 (patch) | |
tree | 7c88468ce36b6a4ab02eb1ca993baf83a14ab62d /keystone/token | |
parent | 88c319e6bce98082f9a90b8b27726793d5366326 (diff) | |
download | keystone-71edac1585fd3cf6333e8f642339ce63784d4f53.tar.gz keystone-71edac1585fd3cf6333e8f642339ce63784d4f53.tar.xz keystone-71edac1585fd3cf6333e8f642339ce63784d4f53.zip |
Fix XML rendering with empty auth payload.
Just add some sensible defaults to places where XML parses for example
an empty dictionary as an empty string. Also 'access' shouldn't be
considered a plural.
Change-Id: I9fb2c4f5c32ed8c2ce8ba4038caaae39590f8c1a
Diffstat (limited to 'keystone/token')
-rw-r--r-- | keystone/token/controllers.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/keystone/token/controllers.py b/keystone/token/controllers.py index 4914d305..7a5b9be3 100644 --- a/keystone/token/controllers.py +++ b/keystone/token/controllers.py @@ -262,6 +262,11 @@ class Auth(controller.V2Controller): if 'REMOTE_USER' not in context: raise ExternalAuthNotApplicable() + #NOTE(jamielennox): xml and json differ and get confused about what + # empty auth should look like so just reset it. + if not auth: + auth = {} + username = context['REMOTE_USER'] try: user_ref = self.identity_api.get_user_by_name( |