openstack/python-novaclient
Code Issues Proposed changes

Fix a fault of request logging with no credentials

Browse Source 
If a user doesn't specify for novaclient's Client neither credentials
nor auth token, but specifies http_log_debug=True, and requests Nova
version list, novaclient fails with AttributeError exception.

The reason is that obfuscation of auth token doesn't expect None value
of the token. This patch bypass obfuscation of None token.

Closes-Bug: #1488169
Change-Id: I3712d633719bc77310ce863da33b2eec59a7ce91
This commit is contained in:
Feodor Tersin 2015-08-24 19:45:53 +03:00
parent 63a32946c7
commit b6130e2e18
2 changed files with 7 additions and 1 deletions
novaclient
client.py
tests/unit
test_client.py

2
novaclient/client.py

@ -260,7 +260,7 @@ class HTTPClient(object):
if key in target:
if text:
target[key] = text
else:
elif target[key] is not None:
# because in python3 byte string handling is ... ug
value = target[key].encode('utf-8')
sha1sum = hashlib.sha1(value)

6
novaclient/tests/unit/test_client.py

@ -360,6 +360,8 @@ class ClientTest(utils.TestCase):
connection_pool=True)
cs.http_log_debug = True
cs.http_log_req('GET', '/foo', {'headers': {}})
cs.http_log_req('GET', '/foo', {'headers':
{'X-Auth-Token': None}})
cs.http_log_req('GET', '/foo', {'headers':
{'X-Auth-Token': 'totally_bogus'}})
cs.http_log_req('GET', '/foo', {'headers':
@ -373,6 +375,10 @@ class ClientTest(utils.TestCase):
output = self.logger.output.split('\n')
self.assertIn("REQ: curl -g -i '/foo' -X GET", output)
self.assertIn(
"REQ: curl -g -i '/foo' -X GET -H "
'"X-Auth-Token: None"',
output)
self.assertIn(
"REQ: curl -g -i '/foo' -X GET -H "
'"X-Auth-Token: {SHA1}b42162b6ffdbd7c3c37b7c95b7ba9f51dda0236d"',