summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Willey <xtoddx@gmail.com>2011-06-22 19:14:07 -0400
committerTodd Willey <xtoddx@gmail.com>2011-06-22 19:14:07 -0400
commitdbbc17b8a5ae96152296eb893a2635909e785bcc (patch)
tree26f8c38992e069f154102edd45c158908f5f5880
parent6d2b51e8711ee96212efbdb65c2747a11b16ebf6 (diff)
downloadkeystone-dbbc17b8a5ae96152296eb893a2635909e785bcc.tar.gz
keystone-dbbc17b8a5ae96152296eb893a2635909e785bcc.tar.xz
keystone-dbbc17b8a5ae96152296eb893a2635909e785bcc.zip
Remove swift-y bits from generic token auth.
-rwxr-xr-xkeystone/auth_protocols/auth_token.py13
1 files changed, 0 insertions, 13 deletions
diff --git a/keystone/auth_protocols/auth_token.py b/keystone/auth_protocols/auth_token.py
index 107d688b..95049213 100755
--- a/keystone/auth_protocols/auth_token.py
+++ b/keystone/auth_protocols/auth_token.py
@@ -159,8 +159,6 @@ class AuthProtocol(object):
claims = self._expound_claims()
# Store authentication data
- self.env['keystone.claims'] = claims
- self.env['swift.authorize'] = self.authorize
if claims:
# TODO(Ziad): add additional details we may need,
# like tenant and group info
@@ -185,17 +183,6 @@ class AuthProtocol(object):
#Send request downstream
return self._forward_request()
- def authorize(self, req):
- env = req.environ
- tenant = env.get('keystone.claims', {}).get('tenant')
- if not tenant:
- return HTTPExpectationFailed('Unable to locate auth claim',
- request=req)
- if req.path.startswith('/v1/AUTH_%s' % tenant):
- return None
- return HTTPUnauthorized(request=req)
-
-
# NOTE(todd): unused
def get_admin_auth_token(self, username, password, tenant):
"""