openstack/python-swiftclient
Code Issues Proposed changes

Make sure we get a header StorageURL with 1.0

Browse Source 
- Since RAX auth always come back with 200 we can't check with status code.
This commit is contained in:
Chmouel Boudjnah 2012-05-08 14:10:14 +01:00
parent 9ee3ee6e6d
commit 4c5ee99f5b
1 changed files with 7 additions and 3 deletions

10
swiftclient/client.py

@ -169,13 +169,17 @@ def _get_auth_v1_0(url, user, key, snet):
conn.request('GET', parsed.path, '', conn.request('GET', parsed.path, '',
{'X-Auth-User': user, 'X-Auth-Key': key}) {'X-Auth-User': user, 'X-Auth-Key': key})
resp = conn.getresponse() resp = conn.getresponse()
resp.read() body = resp.read()
if resp.status < 200 or resp.status >= 300: url = resp.getheader('x-storage-url')
# There is a side-effect on current Rackspace 1.0 server where a
# bad URL would get you that document page and a 200. We error out
# if we don't have a x-storage-url header and if we get a body.
if resp.status < 200 or resp.status >= 300 or (body and not url):
raise ClientException('Auth GET failed', http_scheme=parsed.scheme, raise ClientException('Auth GET failed', http_scheme=parsed.scheme,
http_host=conn.host, http_port=conn.port, http_host=conn.host, http_port=conn.port,
http_path=parsed.path, http_status=resp.status, http_path=parsed.path, http_status=resp.status,
http_reason=resp.reason) http_reason=resp.reason)
url = resp.getheader('x-storage-url')
if snet: if snet:
parsed = list(urlparse(url)) parsed = list(urlparse(url))
# Second item in the list is the netloc # Second item in the list is the netloc