mooli tayer has uploaded a new change for review. Change subject: aaa: remove AdminDomain definition and treat like any other profile. ......................................................................
aaa: remove AdminDomain definition and treat like any other profile. This option became redundant with introduction of auth profiles. It was never exposed (Engine Config). Change-Id: I375df1489ed59d98a7be0e3d629b662a0d764d10 Topic: AAA Signed-off-by: Mooli Tayer <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDomainListQuery.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginDomainComparator.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDomainListQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LoginDomainComparatorTest.java M backend/manager/modules/builtin-extensions/src/main/resources/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/defaults.properties M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java A packaging/dbscripts/upgrade/03_05_0760_remove_admin_domain_config_entry.sql 7 files changed, 9 insertions(+), 92 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/29774/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDomainListQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDomainListQuery.java index ccc1f19..e82c137 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDomainListQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDomainListQuery.java @@ -15,15 +15,15 @@ import org.ovirt.engine.core.utils.extensionsmgr.EngineExtensionsManager; public class GetDomainListQuery<P extends GetDomainListParameters> extends QueriesCommandBase<P> { + + public static final String INTERNAL = "internal"; + public GetDomainListQuery(P parameters) { super(parameters); } @Override protected void executeQueryCommand() { - // Get the name of the internal domain: - String internal = Config.<String> getValue(ConfigValues.AdminDomain); - // Get the list of authentication profile names: List<ExtensionProxy> extensions = getExtensionsManager().getExtensionsByService(Authz.class.getName()); @@ -32,11 +32,9 @@ names.add(AuthzUtils.getName(extension)); } if (getParameters().getFilterInternalDomain()) { - names.remove(internal); + names.remove(INTERNAL); } - - // Sort it so that the internal profile is always the last: - sort(names, new LoginDomainComparator(internal)); + sort(names); // Return the sorted list: getQueryReturnValue().setReturnValue(names); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginDomainComparator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginDomainComparator.java deleted file mode 100644 index a7a2a1e..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginDomainComparator.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.ovirt.engine.core.bll; - -import java.io.Serializable; -import java.util.Comparator; - -/** - * Used to sort the login domain list on the login page. Business rule is sort alphabetically, - * but put "internal" at the end. - */ -public class LoginDomainComparator implements Comparator<String>, Serializable { - - private static final long serialVersionUID = -1679928871675563671L; - - private String internal; - - public LoginDomainComparator(String internal) { - this.internal = internal; - } - - @Override - public int compare(String a, String b) { - if (a == b) return 0; - if (a == null) return -1; - if (b == null) return 1; - if (a.equals(internal)) return 1; - if (b.equals(internal)) return -1; - return a.compareTo(b); - } - -} diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDomainListQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDomainListQueryTest.java index ea63a7b..4234971 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDomainListQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDomainListQueryTest.java @@ -59,11 +59,6 @@ private MockEngineExtensionsManager extMgr = new MockEngineExtensionsManager(); - @ClassRule - public static final MockConfigRule MCR = new MockConfigRule( - mockConfig(ConfigValues.AdminDomain, INTERNAL) - ); - @Before @Override public void setUp() throws Exception { diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LoginDomainComparatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LoginDomainComparatorTest.java index 6cdf81b..61e6b8e 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LoginDomainComparatorTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LoginDomainComparatorTest.java @@ -14,57 +14,19 @@ public class LoginDomainComparatorTest { @Test - public void testCompareWithoutInternal() { + public void testCompare() { List<String> list = new ArrayList<String>(); list.add("a1"); list.add("b1"); list.add("c1"); list.add("d1"); list.add("a2"); - Collections.sort(list, new LoginDomainComparator("internal")); + Collections.sort(list); assertEquals("a1", list.get(0)); assertEquals("a2", list.get(1)); assertEquals("b1", list.get(2)); assertEquals("c1", list.get(3)); assertEquals("d1", list.get(4)); - } - - @Test - public void testCompareWithInternal() { - List<String> list = new ArrayList<String>(); - list.add("a1"); - list.add("b1"); - list.add("internal"); - list.add("c1"); - list.add("d1"); - list.add("a2"); - Collections.sort(list, new LoginDomainComparator("internal")); - assertEquals("a1", list.get(0)); - assertEquals("a2", list.get(1)); - assertEquals("b1", list.get(2)); - assertEquals("c1", list.get(3)); - assertEquals("d1", list.get(4)); - assertEquals("internal", list.get(5)); - } - - @Test - public void testCompareWithTwoInternal() { - List<String> list = new ArrayList<String>(); - list.add("a1"); - list.add("b1"); - list.add("internal"); - list.add("c1"); - list.add("d1"); - list.add("internal"); - list.add("a2"); - Collections.sort(list, new LoginDomainComparator("internal")); - assertEquals("a1", list.get(0)); - assertEquals("a2", list.get(1)); - assertEquals("b1", list.get(2)); - assertEquals("c1", list.get(3)); - assertEquals("d1", list.get(4)); - assertEquals("internal", list.get(5)); - assertEquals("internal", list.get(6)); } @Test @@ -72,18 +34,14 @@ List<String> list = new ArrayList<String>(); list.add(null); list.add(null); - list.add("internal"); list.add("c1"); list.add("d1"); - list.add("internal"); list.add("a2"); - Collections.sort(list, new LoginDomainComparator("internal")); + Collections.sort(list); assertEquals(null, list.get(0)); assertEquals(null, list.get(1)); assertEquals("a2", list.get(2)); assertEquals("c1", list.get(3)); assertEquals("d1", list.get(4)); - assertEquals("internal", list.get(5)); - assertEquals("internal", list.get(6)); } } diff --git a/backend/manager/modules/builtin-extensions/src/main/resources/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/defaults.properties b/backend/manager/modules/builtin-extensions/src/main/resources/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/defaults.properties index 6ad57da..77abaf7 100644 --- a/backend/manager/modules/builtin-extensions/src/main/resources/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/defaults.properties +++ b/backend/manager/modules/builtin-extensions/src/main/resources/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/defaults.properties @@ -12,5 +12,4 @@ config.MaxLDAPQueryPartsNumber=100 config.LDAPOperationTimeout=30 config.LdapQueryPageSize=1000 -config.AdminDomain="" config.JAASLoginContext=oVirtKerb diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index 7f2b954..8ae7909 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -849,10 +849,6 @@ AdminUser, @TypeConverterAttribute(String.class) - @DefaultValueAttribute("internal") - AdminDomain, - - @TypeConverterAttribute(String.class) @DefaultValueAttribute("") @OptionBehaviourAttribute(behaviour = OptionBehaviour.Password) AdminPassword, diff --git a/packaging/dbscripts/upgrade/03_05_0760_remove_admin_domain_config_entry.sql b/packaging/dbscripts/upgrade/03_05_0760_remove_admin_domain_config_entry.sql new file mode 100644 index 0000000..416c3c8 --- /dev/null +++ b/packaging/dbscripts/upgrade/03_05_0760_remove_admin_domain_config_entry.sql @@ -0,0 +1 @@ +SELECT fn_db_delete_config_value_all_versions('AdminDomain'); -- To view, visit http://gerrit.ovirt.org/29774 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I375df1489ed59d98a7be0e3d629b662a0d764d10 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: mooli tayer <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
