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 <[email protected]> --- M ovirt-engine.spec.in M packaging/setup/plugins/ovirt-engine-common/base/db/connection.py M packaging/setup/plugins/ovirt-engine-rename/core/pki.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/db/connection.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py 6 files changed, 23 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/25379/1 diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index 67847f9..5b9e0ab 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -320,7 +320,7 @@ Requires: iproute Requires: libxml2-python Requires: logrotate -Requires: otopi >= 1.2.0 +Requires: otopi >= 1.2.0-0.7 %description setup-base %{ovirt_product_name_short} suite base setup components. diff --git a/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py b/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py index 2b3bcd3..32de13c 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py @@ -47,7 +47,7 @@ ) def _boot(self): self.environment[ - otopicons.BaseEnv.SUPPRESS_ENVIRONMENT_KEYS + otopicons.CoreEnv.LOG_FILTER_KEYS ].append( osetupcons.DBEnv.PASSWORD ) @@ -127,10 +127,6 @@ ) ): dbenv[e] = config.getboolean(k) - - self.environment[otopicons.CoreEnv.LOG_FILTER].append( - dbenv[osetupcons.DBEnv.PASSWORD] - ) dbovirtutils = database.OvirtUtils( plugin=self, diff --git a/packaging/setup/plugins/ovirt-engine-rename/core/pki.py b/packaging/setup/plugins/ovirt-engine-rename/core/pki.py index 3bbf981..9d12d94 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/core/pki.py +++ b/packaging/setup/plugins/ovirt-engine-rename/core/pki.py @@ -52,17 +52,22 @@ self.uninstall_files = [] @plugin.event( + stage=plugin.Stages.STAGE_BOOT, + ) + def _boot(self): + self.environment[ + otopicons.CoreEnv.LOG_FILTER_KEYS + ].append( + osetupcons.PKIEnv.STORE_PASS + ) + + @plugin.event( stage=plugin.Stages.STAGE_INIT, ) def _init(self): self.environment.setdefault( osetupcons.PKIEnv.STORE_PASS, osetupcons.Defaults.DEFAULT_PKI_STORE_PASS - ) - self.environment[otopicons.CoreEnv.LOG_FILTER].append( - self.environment[ - osetupcons.PKIEnv.STORE_PASS - ] ) self.environment.setdefault( osetupcons.RenameEnv.FORCE_IGNORE_AIA_IN_CA, diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/db/connection.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/db/connection.py index 407017a..43b332e 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/db/connection.py @@ -243,8 +243,6 @@ hidden=True, ) - self.environment[otopicons.CoreEnv.LOG_FILTER].append(password) - dbenv = { osetupcons.DBEnv.HOST: host, osetupcons.DBEnv.PORT: port, diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py index b833c16..b88b7de 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py @@ -44,7 +44,7 @@ ) def _boot(self): self.environment[ - otopicons.BaseEnv.SUPPRESS_ENVIRONMENT_KEYS + otopicons.CoreEnv.LOG_FILTER_KEYS ].append( osetupcons.ConfigEnv.ADMIN_PASSWORD ) @@ -132,10 +132,6 @@ self.environment[ osetupcons.ConfigEnv.ADMIN_PASSWORD ] = password - - self.environment[otopicons.CoreEnv.LOG_FILTER].append( - self.environment[osetupcons.ConfigEnv.ADMIN_PASSWORD] - ) @plugin.event( stage=plugin.Stages.STAGE_MISC, diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py index 5cd1648..0172782 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py @@ -76,6 +76,16 @@ self._enabled = False @plugin.event( + stage=plugin.Stages.STAGE_BOOT, + ) + def _boot(self): + self.environment[ + otopicons.CoreEnv.LOG_FILTER_KEYS + ].append( + osetupcons.PKIEnv.STORE_PASS + ) + + @plugin.event( stage=plugin.Stages.STAGE_INIT, ) def _init(self): @@ -90,12 +100,6 @@ self.environment.setdefault( osetupcons.PKIEnv.ORG, None - ) - - self.environment[otopicons.CoreEnv.LOG_FILTER].append( - self.environment[ - osetupcons.PKIEnv.STORE_PASS - ] ) @plugin.event( -- To view, visit http://gerrit.ovirt.org/25379 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia4d1ad9b0acda23a59f55d1653a542c9ea038754 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4.0 Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
