diff options
| author | Ziad Sawalha <github@highbridgellc.com> | 2011-05-25 08:31:48 -0500 |
|---|---|---|
| committer | Ziad Sawalha <github@highbridgellc.com> | 2011-05-25 08:31:48 -0500 |
| commit | 94af36c61d54a1dc822a48d1ccb5cc9fcdee9bd0 (patch) | |
| tree | c993e112f14f1040042d559bd9e879e428a98cb8 | |
| parent | fd1f75c52a1887fb5ce53fd199a8947439409c03 (diff) | |
| parent | ddb951239b76772761b296662dbbbc3b52e10cbc (diff) | |
Merge branch 'master' of https://github.com/khussein/keystone
| -rw-r--r-- | docs/nova-api-paste.ini | 4 | ||||
| -rw-r--r-- | keystone/auth_protocols/auth_token.py | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/docs/nova-api-paste.ini b/docs/nova-api-paste.ini index cb593ce0..b4a94557 100644 --- a/docs/nova-api-paste.ini +++ b/docs/nova-api-paste.ini @@ -83,7 +83,7 @@ paste.filter_factory = nova.api.openstack:FaultWrapper.factory paste.filter_factory = nova.api.openstack.auth:AuthMiddleware.factory [filter:tokenauth] -paste.filter_factory = keystone.auth_protocols.nova_auth_token:filter_factory +paste.filter_factory = keystone.auth_protocols.auth_token:filter_factory service_protocol = http service_host = 127.0.0.1 service_port = 808 @@ -93,7 +93,7 @@ auth_protocol = http admin_token = 999888777666 [filter:auth_shim] -paste.filter_factory = keystone.auth_protocols.auth_token:KeystoneAuthShim.factory +paste.filter_factory = keystone.auth_protocols.nova_auth_token:KeystoneAuthShim.factory [filter:ratelimit] paste.filter_factory = nova.api.openstack.limits:RateLimitingMiddleware.factory diff --git a/keystone/auth_protocols/auth_token.py b/keystone/auth_protocols/auth_token.py index 4de54a55..d6bc9270 100644 --- a/keystone/auth_protocols/auth_token.py +++ b/keystone/auth_protocols/auth_token.py @@ -161,10 +161,8 @@ class AuthProtocol(object): if claims: # TODO(Ziad): add additional details we may need, # like tenant and group info - self._decorate_request('X_AUTHORIZATION', - "Proxy %s" % claims['user']) - self._decorate_request('X_TENANT', - claims['tenant']) + self._decorate_request('X_AUTHORIZATION', claims['user']) + self._decorate_request('X_TENANT', claims['tenant']) if 'group' in claims: self._decorate_request('X_GROUP', claims['group']) self.expanded = True |