openstack
/
nova
Code Issues Proposed changes

Merge "libvirt: mask InjectionInfo.admin_pass" into stable/ocata

This commit is contained in:
Zuul 2018-04-18 21:53:19 +00:00 committed by Gerrit Code Review
parent 2fffe19634 1291d45418
commit 8a1c667fb3
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/tests/unit/virt/libvirt/test_driver.py
View File

@ -10804,6 +10804,14 @@ class LibvirtConnTestCase(test.NoDBTestCase):
]
self.assertEqual(wantFiles, gotFiles)
def test_injection_info_is_sanitized(self):
info = get_injection_info(
network_info=mock.sentinel.network_info,
files=mock.sentinel.files,
admin_pass='verybadpass')
self.assertNotIn('verybadpass', str(info))
self.assertNotIn('verybadpass', repr(info))
@mock.patch(
'nova.virt.libvirt.driver.LibvirtDriver._build_device_metadata')
@mock.patch('nova.api.metadata.base.InstanceMetadata')

10
nova/virt/libvirt/driver.py
View File

@ -141,8 +141,14 @@ CONSOLE = "console=tty0 console=ttyS0"
GuestNumaConfig = collections.namedtuple(
'GuestNumaConfig', ['cpuset', 'cputune', 'numaconfig', 'numatune'])
InjectionInfo = collections.namedtuple(
'InjectionInfo', ['network_info', 'files', 'admin_pass'])
class InjectionInfo(collections.namedtuple(
'InjectionInfo', ['network_info', 'files', 'admin_pass'])):
__slots__ = ()
def __repr__(self):
return ('InjectionInfo(network_info=%r, files=%r, '
'admin_pass=<SANITIZED>)') % (self.network_info, self.files)
libvirt_volume_drivers = [
'iscsi=nova.virt.libvirt.volume.iscsi.LibvirtISCSIVolumeDriver',