From dbbc17b8a5ae96152296eb893a2635909e785bcc Mon Sep 17 00:00:00 2001 From: Todd Willey Date: Wed, 22 Jun 2011 19:14:07 -0400 Subject: Remove swift-y bits from generic token auth. --- keystone/auth_protocols/auth_token.py | 13 ------------- 1 file changed, 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): """ -- cgit