Yair Zaslavsky has uploaded a new change for review. Change subject: aaa: Fix apperance of empty profile ......................................................................
aaa: Fix apperance of empty profile Change-Id: Icbf9384f40ad061ec35c03c4fbcbd1dd70085526 Topic: AAA Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java 1 file changed, 21 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/93/25993/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java index c1eb7f4..8c7c08c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java @@ -133,26 +133,28 @@ private void createKerberosLdapAAAConfigurations() { - for (String domain : Config.<String> getValue(ConfigValues.DomainName).split("[,]", -1)) { - Properties authConfig = new Properties(); - authConfig.put(ExtensionsManager.CLASS, - "org.ovirt.engine.extensions.aaa.builtin.kerberosldap.KerberosLdapAuthenticator"); - authConfig.put(ExtensionsManager.PROVIDES, "org.ovirt.engine.authentication"); - authConfig.put(ExtensionsManager.ENABLED, "true"); - authConfig.put(ExtensionsManager.MODULE, "org.ovirt.engine.extensions.builtin"); - authConfig.put(ExtensionsManager.NAME, String.format("builtin-authn-%1$s", domain)); - authConfig.put("ovirt.engine.aaa.authn.profile.name", domain); - authConfig.put("ovirt.engine.aaa.authn.authz.plugin", domain); - ExtensionsManager.getInstance().load(authConfig); + for (String domain : Config.<String> getValue(ConfigValues.DomainName).split("[,]", 0)) { + if (!domain.isEmpty()) { + Properties authConfig = new Properties(); + authConfig.put(ExtensionsManager.CLASS, + "org.ovirt.engine.extensions.aaa.builtin.kerberosldap.KerberosLdapAuthenticator"); + authConfig.put(ExtensionsManager.PROVIDES, "org.ovirt.engine.authentication"); + authConfig.put(ExtensionsManager.ENABLED, "true"); + authConfig.put(ExtensionsManager.MODULE, "org.ovirt.engine.extensions.builtin"); + authConfig.put(ExtensionsManager.NAME, String.format("builtin-authn-%1$s", domain)); + authConfig.put("ovirt.engine.aaa.authn.profile.name", domain); + authConfig.put("ovirt.engine.aaa.authn.authz.plugin", domain); + ExtensionsManager.getInstance().load(authConfig); - Properties dirConfig = new Properties(); - dirConfig.put(ExtensionsManager.CLASS, - "org.ovirt.engine.extensions.aaa.builtin.kerberosldap.KerberosLdapDirectory"); - dirConfig.put(ExtensionsManager.PROVIDES, "org.ovirt.engine.authorization"); - dirConfig.put(ExtensionsManager.ENABLED, "true"); - dirConfig.put(ExtensionsManager.MODULE, "org.ovirt.engine.extensions.builtin"); - dirConfig.put(ExtensionsManager.NAME, domain); - ExtensionsManager.getInstance().load(dirConfig); + Properties dirConfig = new Properties(); + dirConfig.put(ExtensionsManager.CLASS, + "org.ovirt.engine.extensions.aaa.builtin.kerberosldap.KerberosLdapDirectory"); + dirConfig.put(ExtensionsManager.PROVIDES, "org.ovirt.engine.authorization"); + dirConfig.put(ExtensionsManager.ENABLED, "true"); + dirConfig.put(ExtensionsManager.MODULE, "org.ovirt.engine.extensions.builtin"); + dirConfig.put(ExtensionsManager.NAME, domain); + ExtensionsManager.getInstance().load(dirConfig); + } } } -- To view, visit http://gerrit.ovirt.org/25993 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icbf9384f40ad061ec35c03c4fbcbd1dd70085526 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
