openstack/openstacksdk
Code Issues Proposed changes

Merge "Only log text strings in requests"

Browse Source
This commit is contained in:
Jenkins 2015-08-18 23:06:09 +00:00 committed by Gerrit Code Review
commit 33cd0fd4fe
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
openstack/transport.py
View File

@ -364,8 +364,26 @@ class Transport(requests.Session):
if 'data' in kwargs and kwargs['data'] is not None:
string_parts.append("--data '")
string_parts.append(kwargs['data'])
data = kwargs['data']
# Only log text strings and byte strings that can be decoded
# in ascii. Raw byte strings both mess up the actual
# writing of the data to any log stream because we'd be mixing
# text and bytes, and they are generally overly long strings
# that would make the logs unreadable anyway.
if isinstance(data, six.binary_type):
# Some data, such as auth creds, is generally decodable
# to ascii. If it works, log it, otherwise put in a
# placeholder to specify that it's a blob of binary data.
try:
string_parts.append(data.decode("ascii"))
except UnicodeDecodeError:
string_parts.append("<binary data>")
else:
string_parts.append(data)
string_parts.append("'")
_logger.debug("REQ: %s" % " ".join(string_parts))
def _log_response(self, response):