openstack/swift
Code Issues Proposed changes

Merged from trunk

Browse Source
This commit is contained in:
gholt
2011-06-10 16:04:15 +00:00
parent 145651e04f e32c146e27
commit 8c191aebab
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
swift/common/middleware/tempauth.py
View File

@@ -118,17 +118,17 @@ class TempAuth(object):
""" """
# Ensure the accounts we handle have been created # Ensure the accounts we handle have been created
if not self.created_accounts and self.users: if not self.created_accounts and self.users:
newenv = {'REQUEST_METHOD': 'GET', 'HTTP_USER_AGENT': 'TempAuth'} newenv = {'REQUEST_METHOD': 'HEAD', 'HTTP_USER_AGENT': 'TempAuth'}
for name in ('swift.cache', 'HTTP_X_TRANS_ID'): for name in ('swift.cache', 'HTTP_X_TRANS_ID'):
if name in env: if name in env:
newenv[name] = env[name] newenv[name] = env[name]
account_id = self.users.values()[0]['url'].rsplit('/', 1)[-1] for key, value in self.users.iteritems():
resp = Request.blank('/v1/' + account_id, account_id = value['url'].rsplit('/', 1)[-1]
environ=newenv).get_response(self.app) newenv['REQUEST_METHOD'] = 'HEAD'
if resp.status_int // 100 != 2: resp = Request.blank('/v1/' + account_id,
newenv['REQUEST_METHOD'] = 'PUT' environ=newenv).get_response(self.app)
for key, value in self.users.iteritems(): if resp.status_int // 100 != 2:
account_id = value['url'].rsplit('/', 1)[-1] newenv['REQUEST_METHOD'] = 'PUT'
resp = Request.blank('/v1/' + account_id, resp = Request.blank('/v1/' + account_id,
environ=newenv).get_response(self.app) environ=newenv).get_response(self.app)
if resp.status_int // 100 != 2: if resp.status_int // 100 != 2: