Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: setup: database: suppress password based on env key ......................................................................
packaging: setup: database: suppress password based on env key Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1072476 Change-Id: Ia4d1ad9b0acda23a59f55d1653a542c9ea038754 Signed-off-by: Alon Bar-Lev <alo...@redhat.com> --- M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py 3 files changed, 20 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/61/25361/1 diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py index 0491027..c3e39ea 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py @@ -52,6 +52,11 @@ ].append( oreportscons.DBEnv.PASSWORD ) + self.environment[ + otopicons.CoreEnv.LOG_FILTER_KEYS + ].append( + oreportscons.DBEnv.PASSWORD + ) @plugin.event( stage=plugin.Stages.STAGE_INIT, @@ -160,10 +165,6 @@ ] = dbenv[ oreportscons.DBEnv.SECURED_HOST_VALIDATION ] = False - - self.environment[otopicons.CoreEnv.LOG_FILTER].append( - dbenv[oreportscons.DBEnv.PASSWORD] - ) dbovirtutils = database.OvirtUtils( plugin=self, diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py index e79c3ae..7672972 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py @@ -37,15 +37,27 @@ super(Plugin, self).__init__(context=context) @plugin.event( + stage=plugin.Stages.STAGE_BOOT, + ) + def _boot(self): + self.environment[ + otopicons.BaseEnv.SUPPRESS_ENVIRONMENT_KEYS + ].append( + oreportscons.ConfigEnv.ADMIN_PASSWORD + ) + self.environment[ + otopicons.CoreEnv.LOG_FILTER_KEYS + ].append( + oreportscons.ConfigEnv.ADMIN_PASSWORD + ) + + @plugin.event( stage=plugin.Stages.STAGE_INIT, ) def _init(self): self.environment.setdefault( oreportscons.ConfigEnv.ADMIN_PASSWORD, None - ) - self.environment[otopicons.CoreEnv.LOG_FILTER_KEYS].append( - oreportscons.ConfigEnv.ADMIN_PASSWORD ) @plugin.event( @@ -119,10 +131,6 @@ ) self.environment[oreportscons.ConfigEnv.ADMIN_PASSWORD] = password - - self.environment[otopicons.CoreEnv.LOG_FILTER].append( - self.environment[oreportscons.ConfigEnv.ADMIN_PASSWORD] - ) # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py index 786f0da..19a44c0 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py @@ -247,8 +247,6 @@ hidden=True, ) - self.environment[otopicons.CoreEnv.LOG_FILTER].append(password) - dbenv = { oreportscons.DBEnv.HOST: host, oreportscons.DBEnv.PORT: port, -- To view, visit http://gerrit.ovirt.org/25361 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia4d1ad9b0acda23a59f55d1653a542c9ea038754 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
