Merge "Revert "Change log hashing to SHA256"" into stable/rocky
This commit is contained in:
commit
8505f37124
|
@ -365,10 +365,10 @@ class Session(object):
|
|||
secure_headers = ('authorization', 'x-auth-token',
|
||||
'x-subject-token', 'x-service-token')
|
||||
if header[0].lower() in secure_headers:
|
||||
token_hasher = hashlib.sha256()
|
||||
token_hasher = hashlib.sha1() # nosec log hashing
|
||||
token_hasher.update(header[1].encode('utf-8'))
|
||||
token_hash = token_hasher.hexdigest()
|
||||
return (header[0], '{SHA256}%s' % token_hash)
|
||||
return (header[0], '{SHA1}%s' % token_hash)
|
||||
return header
|
||||
|
||||
def _get_split_loggers(self, split_loggers):
|
||||
|
|
|
@ -324,7 +324,7 @@ class SessionTests(utils.TestCase):
|
|||
# Assert that response headers contains actual values and
|
||||
# only debug logs has been masked
|
||||
for k, v in security_headers.items():
|
||||
self.assertIn('%s: {SHA256}' % k, self.logger.output)
|
||||
self.assertIn('%s: {SHA1}' % k, self.logger.output)
|
||||
self.assertEqual(v, resp.headers[k])
|
||||
self.assertNotIn(v, self.logger.output)
|
||||
|
||||
|
|
Loading…
Reference in New Issue