From dcfe3ad0fbc59287fbc30469e32de9378925b0f6 Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Fri, 6 Nov 2020 11:43:38 +0000 Subject: strutils: Stop masking encryption_key_id As the name suggests this is simply an id referring to a key and not the actual key itself. As such we should stop masking this in an effort to ease debugging and troubleshooting when it is logged. This was previously incorrectly masked by I9e684cd8bab85728ff0117f95a30eb7dbb5bf51c as part of bug #1814365. Closes-Bug: #1905264 Change-Id: I856e3cf32c409debdfb15aa96415c3309fe2f516 --- oslo_utils/strutils.py | 2 +- oslo_utils/tests/test_strutils.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/oslo_utils/strutils.py b/oslo_utils/strutils.py index 6295bde..86b2e6b 100644 --- a/oslo_utils/strutils.py +++ b/oslo_utils/strutils.py @@ -60,7 +60,7 @@ _SANITIZE_KEYS = ['adminpass', 'admin_pass', 'password', 'admin_password', 'auth_token', 'new_pass', 'auth_password', 'secret_uuid', 'secret', 'sys_pswd', 'token', 'configdrive', 'chappassword', 'encrypted_key', 'private_key', - 'encryption_key_id', 'fernetkey', 'sslkey', 'passphrase', + 'fernetkey', 'sslkey', 'passphrase', 'cephclusterfsid', 'octaviaheartbeatkey', 'rabbitcookie', 'cephmanilaclientkey', 'pacemakerremoteauthkey', 'designaterndckey', 'cephadminkey', 'heatauthencryptionkey', diff --git a/oslo_utils/tests/test_strutils.py b/oslo_utils/tests/test_strutils.py index f43cef2..3792ae1 100644 --- a/oslo_utils/tests/test_strutils.py +++ b/oslo_utils/tests/test_strutils.py @@ -507,9 +507,6 @@ class MaskPasswordTestCase(test_base.BaseTestCase): payload = """body: {"rescue": {"password": "1234567"}}""" expected = """body: {"rescue": {"password": "***"}}""" self.assertEqual(expected, strutils.mask_password(payload)) - payload = """body: {"rescue": {"encryption_key_id": "1234567"}}""" - expected = """body: {"rescue": {"encryption_key_id": "***"}}""" - self.assertEqual(expected, strutils.mask_password(payload)) def test_xml_message(self): payload = """ -- cgit v1.2.1