openstack
/
nova
Code Issues Proposed changes

Avoid showing password in log 

per bug indicated, the password is shown in the log.

https://github.com/openstack/oslo.utils/blob/master/oslo_utils/strutils.py#L295
indicated auth_password can be masked through mask_password method.

Conflicts:
        nova/compute/manager.py

NOTE(lyarwood): Conflicts caused by Ica323b87fa85a454fca9d46ada3677f18fe50022
and Ifc01dbf98545104c998ab96f65ff8623a6db0f28 not being present in Pike.
Additionally If12e7860baad2899380f06144a0270784a5466b8 was not present
in Queens but landed in Pike and Ocata as a stable only change.

Change-Id: I725eea1866642b40cc6b065ed0e8aefb91ca2889
Closes-Bug: 1761054
(cherry picked from commit 1b61d6c08c)
(cherry picked from commit df90dfd5cd)
(cherry picked from commit 978066fe31)
This commit is contained in:
jichenjc 2018-04-04 13:26:01 +08:00 committed by Lee Yarwood
parent a0bcc6bda0
commit c17516f399
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nova/compute/manager.py
View File

@ -5027,16 +5027,19 @@ class ComputeManager(manager.Manager):
# currently implementing swap_volume, will modify the contents of
# new_cinfo when connect_volume is called. This is then saved to
# the BDM in swap_volume for future use outside of this flow.
LOG.debug("swap_volume: Calling driver volume swap with "
"connection infos: new: %(new_cinfo)s; "
"old: %(old_cinfo)s",
{'new_cinfo': new_cinfo, 'old_cinfo': old_cinfo},
instance=instance)
msg = ("swap_volume: Calling driver volume swap with "
"connection infos: new: %(new_cinfo)s; "
"old: %(old_cinfo)s" %
{'new_cinfo': new_cinfo, 'old_cinfo': old_cinfo})
# Both new and old info might contain password
LOG.debug(strutils.mask_password(msg), instance=instance)
self.driver.swap_volume(context, old_cinfo, new_cinfo, instance,
mountpoint, resize_to)
LOG.debug("swap_volume: Driver volume swap returned, new "
"connection_info is now : %(new_cinfo)s",
{'new_cinfo': new_cinfo})
msg = ("swap_volume: Driver volume swap returned, new "
"connection_info is now : %(new_cinfo)s" %
{'new_cinfo': new_cinfo})
LOG.debug(strutils.mask_password(msg))
except Exception as ex:
failed = True
with excutils.save_and_reraise_exception():