Alon Bar-Lev has uploaded a new change for review. Change subject: builtin-extensions: remove EngineEncryptionUtils usage ......................................................................
builtin-extensions: remove EngineEncryptionUtils usage Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1120720 Change-Id: Ic4a2d8927729223c710dfe43c07b85ccbc9b5d56 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapWithConfiguredCredentialsCommandBase.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java 3 files changed, 14 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/34135/1 diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java index e0ef055..6e146c1 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java @@ -1,6 +1,5 @@ package org.ovirt.engine.extensions.aaa.builtin.kerberosldap; -import java.security.GeneralSecurityException; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -12,7 +11,6 @@ import org.ovirt.engine.core.common.businessentities.aaa.LdapGroup; import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; import org.ovirt.engine.core.common.errors.VdcBllMessages; -import org.ovirt.engine.core.utils.crypt.EngineEncryptionUtils; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.kerberos.AuthenticationResult; @@ -88,12 +86,7 @@ protected void setUserDomainCredentials(String domain) { setLoginName(configuration.getProperty("config.AdUserName")); - try { - setPassword(EngineEncryptionUtils.decrypt(configuration.getProperty("config.AdUserPassword"))); - } catch (GeneralSecurityException e) { - log.error(String.format("Error decrypting password. Message is: %1$s", e.getMessage())); - throw new RuntimeException(e); - } + setPassword(configuration.getProperty("config.AdUserPassword")); if (getLoginName().contains("@")) { String userDomain = getLoginName().split("@")[1].toLowerCase(); setAuthenticationDomain(userDomain); diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapWithConfiguredCredentialsCommandBase.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapWithConfiguredCredentialsCommandBase.java index 19c5704..4a4ced1 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapWithConfiguredCredentialsCommandBase.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapWithConfiguredCredentialsCommandBase.java @@ -1,9 +1,5 @@ package org.ovirt.engine.extensions.aaa.builtin.kerberosldap; -import java.security.GeneralSecurityException; - -import org.ovirt.engine.core.utils.crypt.EngineEncryptionUtils; - public abstract class LdapWithConfiguredCredentialsCommandBase extends LdapBrokerCommandBase { @@ -14,11 +10,7 @@ @Override protected void initCredentials(String domain) { setLoginName(configuration.getProperty("config.AdUserName")); - try { - setPassword(EngineEncryptionUtils.decrypt(configuration.getProperty("config.AdUserPassword"))); - } catch (GeneralSecurityException e) { - throw new RuntimeException(e); - } + setPassword(configuration.getProperty("config.AdUserPassword")); if (getLoginName().contains("@")) { String userDomain = getLoginName().split("@")[1].toLowerCase(); setAuthenticationDomain(userDomain); diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java index f5ab28d..ac698a39 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java @@ -21,8 +21,9 @@ import org.ovirt.engine.core.extensions.mgr.ExtensionProxy; import org.ovirt.engine.core.extensions.mgr.ExtensionsManager; import org.ovirt.engine.core.utils.EngineLocalConfig; -import org.slf4j.LoggerFactory; +import org.ovirt.engine.core.utils.crypt.EngineEncryptionUtils; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class EngineExtensionsManager extends ExtensionsManager { @@ -220,9 +221,16 @@ } private void attachConfigValueFromDb(String domain, Properties props, ConfigValues... keys) { - for (ConfigValues key : keys) { - String value = multipleValuesKeys.contains(key.name()) ? getValue(domain, Config.getValue(key).toString()): Config.getValue(key).toString(); - props.put("config." + key.name(), value); + try { + for (ConfigValues key : keys) { + String value = multipleValuesKeys.contains(key.name()) ? getValue(domain, Config.getValue(key).toString()): Config.getValue(key).toString(); + if (ConfigValues.AdUserPassword == key) { + value = EngineEncryptionUtils.decrypt(value); + } + props.put("config." + key.name(), value); + } + } catch(Exception e) { + throw new RuntimeException(e); } } -- To view, visit http://gerrit.ovirt.org/34135 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4a2d8927729223c710dfe43c07b85ccbc9b5d56 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
