Fixed incorrect blanked-out password-like properties

Details:

* The previous fix that blanked out clear-text password-like properties
  had the issue that by mistake it added all possible password-like
  properties with blanked-out values ot the API entry log and HMC request
  log. This change reduces that again to only the properties that exist
  for the resource type.

Signed-off-by: Andreas Maier <[email protected]>

changes/noissue.5.fix.rst

@@ -0,0 +1,2 @@
+Fixed that incorrect password-like properties were added with blanked-out values
+to the API and HMC log.

zhmcclient/_logging.py

@@ -255,11 +255,9 @@ def blanked_dict(properties):
             # properties may also be a DictView (subclass of Mapping)
             assert isinstance(properties, Mapping)
             copied_properties = dict(properties)
-            for pn in blanked_properties:
-                try:
-                    copied_properties[pn] = BLANKED_OUT_STRING
-                except KeyError:
-                    pass
+            for pname in blanked_properties:
+                if pname in copied_properties:
+                    copied_properties[pname] = BLANKED_OUT_STRING
             return copied_properties
 
         def blanked_args(args, kwargs):

zhmcclient/_session.py

@@ -967,11 +967,9 @@ def _log_http_request(
                 # structured data such as a password or session IDs.
                 pass
             else:
-                for prop in BLANKED_OUT_PROPERTIES:
-                    try:
-                        content_dict[prop] = BLANKED_OUT_STRING
-                    except KeyError:
-                        pass
+                for pname in BLANKED_OUT_PROPERTIES:
+                    if pname in content_dict:
+                        content_dict[pname] = BLANKED_OUT_STRING
                 content = dict2json(content_dict)
             trunc = 30000
             if content_len > trunc: