From f8a53c037a1f80880a9180b218288f1766084449 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 22 Apr 2024 15:35:50 +0900 Subject: [PATCH] Ensure password values are not logged Make sure that all password options is defined with secret=True so that the given values do not appear in debug logs. Also remove the redundant default=None . Change-Id: I989e825ef160a65a5a72c58d6fd4e8099044bcd5 --- manila/share/drivers/dell_emc/driver.py | 1 + manila/share/drivers/hdfs/hdfs_native.py | 1 + manila/share/drivers/infortrend/driver.py | 2 -- manila/share/drivers/macrosan/macrosan_nas.py | 1 - manila/share/drivers/maprfs/maprfs_native.py | 1 + manila/share/drivers/tegile/tegile.py | 1 + manila/share/drivers/zfssa/zfssashare.py | 1 + 7 files changed, 5 insertions(+), 3 deletions(-) diff --git a/manila/share/drivers/dell_emc/driver.py b/manila/share/drivers/dell_emc/driver.py index 996c73605e..660a54e35d 100644 --- a/manila/share/drivers/dell_emc/driver.py +++ b/manila/share/drivers/dell_emc/driver.py @@ -30,6 +30,7 @@ EMC_NAS_OPTS = [ cfg.StrOpt('emc_nas_login', help='User name for the EMC server.'), cfg.StrOpt('emc_nas_password', + secret=True, help='Password for the EMC server.'), cfg.HostAddressOpt('emc_nas_server', help='EMC server hostname or IP address.'), diff --git a/manila/share/drivers/hdfs/hdfs_native.py b/manila/share/drivers/hdfs/hdfs_native.py index e5993c84e4..0faf1ebcab 100644 --- a/manila/share/drivers/hdfs/hdfs_native.py +++ b/manila/share/drivers/hdfs/hdfs_native.py @@ -55,6 +55,7 @@ hdfs_native_share_opts = [ cfg.StrOpt('hdfs_ssh_name', help='HDFS namenode ssh login name.'), cfg.StrOpt('hdfs_ssh_pw', + secret=True, help='HDFS namenode SSH login password, ' 'This parameter is not necessary, if ' '\'hdfs_ssh_private_key\' is configured.'), diff --git a/manila/share/drivers/infortrend/driver.py b/manila/share/drivers/infortrend/driver.py index cc25b4ceb6..6459c5ebba 100644 --- a/manila/share/drivers/infortrend/driver.py +++ b/manila/share/drivers/infortrend/driver.py @@ -31,13 +31,11 @@ infortrend_nas_opts = [ default='manila', help='User for the Infortrend NAS server.'), cfg.StrOpt('infortrend_nas_password', - default=None, secret=True, help='Password for the Infortrend NAS server. ' 'This is not necessary ' 'if infortrend_nas_ssh_key is set.'), cfg.StrOpt('infortrend_nas_ssh_key', - default=None, help='SSH key for the Infortrend NAS server. ' 'This is not necessary ' 'if infortrend_nas_password is set.'), diff --git a/manila/share/drivers/macrosan/macrosan_nas.py b/manila/share/drivers/macrosan/macrosan_nas.py index ff5c5fcc22..6e951467ee 100644 --- a/manila/share/drivers/macrosan/macrosan_nas.py +++ b/manila/share/drivers/macrosan/macrosan_nas.py @@ -35,7 +35,6 @@ macrosan_opts = [ default='manila', help='Username for the Macrosan NAS server.'), cfg.StrOpt('macrosan_nas_password', - default=None, secret=True, help='Password for the Macrosan NAS server.'), cfg.StrOpt('macrosan_nas_http_protocol', diff --git a/manila/share/drivers/maprfs/maprfs_native.py b/manila/share/drivers/maprfs/maprfs_native.py index 7c67b3b23a..708afc9eed 100644 --- a/manila/share/drivers/maprfs/maprfs_native.py +++ b/manila/share/drivers/maprfs/maprfs_native.py @@ -45,6 +45,7 @@ maprfs_native_share_opts = [ default="mapr", help='Cluster admin user ssh login name.'), cfg.StrOpt('maprfs_ssh_pw', + secret=True, help='Cluster node SSH login password, ' 'This parameter is not necessary, if ' '\'maprfs_ssh_private_key\' is configured.'), diff --git a/manila/share/drivers/tegile/tegile.py b/manila/share/drivers/tegile/tegile.py index 5a11c9cb89..52902780b2 100644 --- a/manila/share/drivers/tegile/tegile.py +++ b/manila/share/drivers/tegile/tegile.py @@ -34,6 +34,7 @@ tegile_opts = [ cfg.StrOpt('tegile_nas_login', help='User name for the Tegile NAS server.'), cfg.StrOpt('tegile_nas_password', + secret=True, help='Password for the Tegile NAS server.'), cfg.StrOpt('tegile_default_project', help='Create shares in this project')] diff --git a/manila/share/drivers/zfssa/zfssashare.py b/manila/share/drivers/zfssa/zfssashare.py index d964efc74a..6ab9499497 100644 --- a/manila/share/drivers/zfssa/zfssashare.py +++ b/manila/share/drivers/zfssa/zfssashare.py @@ -35,6 +35,7 @@ ZFSSA_OPTS = [ cfg.StrOpt('zfssa_auth_user', help='ZFSSA management authorized username.'), cfg.StrOpt('zfssa_auth_password', + secret=True, help='ZFSSA management authorized user\'s password.'), cfg.StrOpt('zfssa_pool', help='ZFSSA storage pool name.'),