From 61804a37603efc48970ae15e6b9030b330d14382 Mon Sep 17 00:00:00 2001 From: gholt Date: Thu, 9 Jun 2011 21:02:30 +0000 Subject: [PATCH] tempauth: Check and make all handled accounts --- swift/common/middleware/tempauth.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/swift/common/middleware/tempauth.py b/swift/common/middleware/tempauth.py index 63b3366ce4..d874017ccf 100644 --- a/swift/common/middleware/tempauth.py +++ b/swift/common/middleware/tempauth.py @@ -114,17 +114,17 @@ class TempAuth(object): """ # Ensure the accounts we handle have been created 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'): if name in env: newenv[name] = env[name] - account_id = self.users.values()[0]['url'].rsplit('/', 1)[-1] - resp = Request.blank('/v1/' + account_id, - environ=newenv).get_response(self.app) - if resp.status_int // 100 != 2: - newenv['REQUEST_METHOD'] = 'PUT' - for key, value in self.users.iteritems(): - account_id = value['url'].rsplit('/', 1)[-1] + for key, value in self.users.iteritems(): + account_id = value['url'].rsplit('/', 1)[-1] + newenv['REQUEST_METHOD'] = 'HEAD' + resp = Request.blank('/v1/' + account_id, + environ=newenv).get_response(self.app) + if resp.status_int // 100 != 2: + newenv['REQUEST_METHOD'] = 'PUT' resp = Request.blank('/v1/' + account_id, environ=newenv).get_response(self.app) if resp.status_int // 100 != 2: