diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-06 15:56:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-06 15:56:38 +0000 |
| commit | 987bc6932625d11f62584e6e1a8570a4d61c872e (patch) | |
| tree | b4ec764225eb0973f340012b8fa1834dc45c9ce4 /keystone/middleware | |
| parent | d68ef5864e535e939db5fa9349cd1be55aa8d315 (diff) | |
| parent | daf395b5e85bfa1f91612dda7030b3089ca4da7a (diff) | |
| download | keystone-987bc6932625d11f62584e6e1a8570a4d61c872e.tar.gz keystone-987bc6932625d11f62584e6e1a8570a4d61c872e.tar.xz keystone-987bc6932625d11f62584e6e1a8570a4d61c872e.zip | |
Merge "Use X_USER_NAME and X_ROLES headers."
Diffstat (limited to 'keystone/middleware')
| -rw-r--r-- | keystone/middleware/swift_auth.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/keystone/middleware/swift_auth.py b/keystone/middleware/swift_auth.py index 6a858f75..dfdf8fe3 100644 --- a/keystone/middleware/swift_auth.py +++ b/keystone/middleware/swift_auth.py @@ -135,9 +135,9 @@ class SwiftAuth(object): if environ.get('HTTP_X_IDENTITY_STATUS') != 'Confirmed': return roles = [] - if 'HTTP_X_ROLE' in environ: - roles = environ['HTTP_X_ROLE'].split(',') - identity = {'user': environ.get('HTTP_X_USER'), + if 'HTTP_X_ROLES' in environ: + roles = environ['HTTP_X_ROLES'].split(',') + identity = {'user': environ.get('HTTP_X_USER_NAME'), 'tenant': (environ.get('HTTP_X_TENANT_ID'), environ.get('HTTP_X_TENANT_NAME')), 'roles': roles} |