Yair Zaslavsky has uploaded a new change for review. Change subject: core: Remove the general provider type ......................................................................
core: Remove the general provider type The general provider type is redundant and is not used anymore. It was used in the past as an attempt to perform auto detection to learn about the ldap vendor, but this mechanism was already depracated. Bug-Url: https://bugzilla.redhat.com/1058011 Change-Id: I3414673e2300d44a30ad00ac2acf6762bcdb0700 Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/GetRootDSE.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/GetRootDSETask.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RootDSEFactory.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/UsersDomainsCacheManagerService.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/adbroker/DirectorySearcherTest.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/ldap/LdapProviderType.java 7 files changed, 8 insertions(+), 49 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/24613/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/GetRootDSE.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/GetRootDSE.java index f48c4aa..9de705d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/GetRootDSE.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/GetRootDSE.java @@ -105,36 +105,6 @@ return new InitialDirContext(env); } - /** - * Try to detect which LDAP server type this domain is working with. Since the rootDSE attributes are not standard - * nor compulsory the result is somewhat fragile, therefore deprecated. - * @param domain - * @return {@link LdapProviderType} of this domain. - * @throws NamingException - */ - @Deprecated - public LdapProviderType autoDetectLdapProviderType(String domain) throws NamingException { - log.infoFormat("Trying to auto-detect the LDAP provider type for domain {0}", domain); - LdapProviderType retVal = LdapProviderType.general; - Attributes attributes = getDomainAttributes(LdapProviderType.general, domain); - if (attributes != null) { - if (attributes.get(ADRootDSEAttributes.domainControllerFunctionality.name()) != null) { - retVal = LdapProviderType.activeDirectory; - } else if (attributes.get(RHDSRootDSEAttributes.vendorName.name()) != null) { - String vendorName = (String) attributes.get(RHDSRootDSEAttributes.vendorName.name()).get(0); - if (vendorName.equals(LdapProviderType.ipa.getLdapVendorName())) { - retVal = LdapProviderType.ipa; - } else if (vendorName.equals(LdapProviderType.rhds.getLdapVendorName())) { - retVal = LdapProviderType.rhds; - } else if (vendorName.equals(LdapProviderType.itds.getLdapVendorName())) { - retVal = LdapProviderType.itds; - } - } - } - log.infoFormat("Provider type is {0}", retVal.name()); - updateProviderTypeInConfig(domain, retVal.name()); - return retVal; - } private void updateProviderTypeInConfig(String domain, String type) { String[] types = Config.<String> getValue(ConfigValues.LDAPProviderTypes).split(","); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/GetRootDSETask.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/GetRootDSETask.java index 3f62d80..c4c00a3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/GetRootDSETask.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/GetRootDSETask.java @@ -59,15 +59,10 @@ rootDSE = domainObject.getRootDSE(); if (rootDSE == null) { GetRootDSE query = createGetRootDSE(ldapURI); - ldapProviderType = - (ldapProviderType == LdapProviderType.general ? query.autoDetectLdapProviderType(domainName) - : ldapProviderType); - if (ldapProviderType != LdapProviderType.general) { - Attributes rootDseRecords = query.getDomainAttributes(ldapProviderType, domainName); - if (rootDseRecords != null) { - setRootDSE(domainObject, ldapProviderType, rootDseRecords); - baseDNExist = true; - } + Attributes rootDseRecords = query.getDomainAttributes(ldapProviderType, domainName); + if (rootDseRecords != null) { + setRootDSE(domainObject, ldapProviderType, rootDseRecords); + baseDNExist = true; } else { log.errorFormat("Couldn't deduce provider type for domain {0}", domainName); throw new AuthenticationResultException(AuthenticationResult.CONNECTION_ERROR, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java index af24fa3..d8dc55d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java @@ -44,7 +44,6 @@ Map<LdapQueryType, LdapQueryMetadata> dsHashMap = setDSMap(); Map<LdapQueryType, LdapQueryMetadata> itdsHashMap = setITDSMap(); Map<LdapQueryType, LdapQueryMetadata> openLdapHashMap = setOpenLdapMap(); - Map<LdapQueryType, LdapQueryMetadata> generalHashMap = setGeneralProviderMap(); queryMetadataMap = new HashMap<LdapProviderType, Map<LdapQueryType, LdapQueryMetadata>>(); queryMetadataMap.put(LdapProviderType.activeDirectory, adHashMap); @@ -52,8 +51,6 @@ queryMetadataMap.put(LdapProviderType.rhds, dsHashMap); queryMetadataMap.put(LdapProviderType.itds, itdsHashMap); queryMetadataMap.put(LdapProviderType.openLdap, openLdapHashMap); - queryMetadataMap.put(LdapProviderType.general, generalHashMap); - instance = new LdapQueryMetadataFactoryImpl(); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RootDSEFactory.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RootDSEFactory.java index f0cd52d..6b441f7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RootDSEFactory.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RootDSEFactory.java @@ -20,9 +20,8 @@ return new ITDSRootDSE(rootDseRecords); case openLdap: return new DefaultRootDSE(rootDseRecords); - case general: default: - return new GeneralRootDSE(rootDseRecords); + throw new IllegalArgumentException("Invalid LDAP provider type."); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/UsersDomainsCacheManagerService.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/UsersDomainsCacheManagerService.java index 0a7ccb0..ed03512 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/UsersDomainsCacheManagerService.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/UsersDomainsCacheManagerService.java @@ -166,8 +166,7 @@ domainName = domainName.toLowerCase(); domainsUsersInfoByUserNameAndDomainName.put(domainName, new ConcurrentHashMap<String, UserDomainInfo>()); Domain domain = new Domain(domainName); - domain.setLdapProviderType(domainLDAPProviders.get(domainName) == null ? LdapProviderType.general - : domainLDAPProviders.get(domainName)); + domain.setLdapProviderType(domainLDAPProviders.get(domainName)); domain.setLdapSecurityAuthentication(getDomainSecurityAuthentication(domainName)); domainsByName.put(domainName, domain); domain.setUserName(userPerDomain.get(domainName)); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/adbroker/DirectorySearcherTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/adbroker/DirectorySearcherTest.java index bb68163..aa361d9 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/adbroker/DirectorySearcherTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/adbroker/DirectorySearcherTest.java @@ -123,7 +123,7 @@ final Domain domain = new Domain(""); domain.setLdapServers(urls); domain.setLdapServers(urls); - domain.setLdapProviderType(LdapProviderType.general); + domain.setLdapProviderType(LdapProviderType.openLdap); return domain; } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/ldap/LdapProviderType.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/ldap/LdapProviderType.java index 96e3cfd..bbbef8a 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/ldap/LdapProviderType.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/ldap/LdapProviderType.java @@ -5,8 +5,7 @@ ipa("389 Project"), rhds("Red Hat"), itds("IBM Tivoli Directory Server"), - openLdap("OpenLDAP"), - general("Deprecated - for auto-detection usages"); // for rootDSE purpose + openLdap("OpenLDAP"); private String vendorName; -- To view, visit http://gerrit.ovirt.org/24613 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3414673e2300d44a30ad00ac2acf6762bcdb0700 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
