Juan Hernandez has uploaded a new change for review. Change subject: core: Remove RHDSUPNLdapQueryExecutionFormatter ......................................................................
core: Remove RHDSUPNLdapQueryExecutionFormatter The logic performed by this class (removing the @domain part from the user name) is now in the template that generates the LDAP query. Change-Id: Ib0225783c2cca67a5518858f4c12bd2201286a84 Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSUPNLdapQueryExecutionFormatter.java M backend/manager/modules/bll/src/main/resources/ldap/rhds/getUserByPrincipalName.filter 3 files changed, 5 insertions(+), 42 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/14837/1 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 0882c6d..685c088 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 @@ -292,7 +292,7 @@ new RHDSUserContextMapper(), SearchControls.SUBTREE_SCOPE, RHDSUserContextMapper.USERS_ATTRIBUTE_FILTER, - new RHDSUPNLdapQueryExecutionFormatter())); + new RHDSSimpleLdapQueryExecutionFormatter())); dsHashMap.put(LdapQueryType.rootDSE, new LdapQueryMetadataImpl( LdapProviderType.rhds, LdapQueryType.rootDSE, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSUPNLdapQueryExecutionFormatter.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSUPNLdapQueryExecutionFormatter.java deleted file mode 100644 index b8348c0..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSUPNLdapQueryExecutionFormatter.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.ovirt.engine.core.bll.adbroker; - -/** - * RHDS doesn't have a UPN, so this formatter practically adjusts the query to search by user name instead of UPN - */ -public class RHDSUPNLdapQueryExecutionFormatter extends SimpleLdapQueryExecutionFormatter { - - /** - * Put the user name instead of the UPN in the filter - */ - protected String getFilter(LdapQueryMetadata queryMetadata) { - String userPrincipalName = (String)queryMetadata.getQueryData().getParameters().get("name"); - String userName = userPrincipalName.split("@")[0]; - return String.format(queryMetadata.getFilter(), userName); - } - - @Override - protected String getDisplayFilter(LdapQueryMetadata queryMetadata) { - return getFilter(queryMetadata); - } - - @Override - public LdapQueryExecution format(LdapQueryMetadata queryMetadata) { - - String filter = getFilter(queryMetadata); - - String baseDN = - String.format(queryMetadata.getBaseDN(), - queryMetadata.getQueryData().getParameters()); - - return new LdapQueryExecution(filter, - getDisplayFilter(queryMetadata), - baseDN, - queryMetadata.getContextMapper(), - queryMetadata.getSearchScope(), - queryMetadata.getReturningAttributes(), - queryMetadata.getQueryData().getDomain()); - } - -} diff --git a/backend/manager/modules/bll/src/main/resources/ldap/rhds/getUserByPrincipalName.filter b/backend/manager/modules/bll/src/main/resources/ldap/rhds/getUserByPrincipalName.filter index b51354c..76903f8 100644 --- a/backend/manager/modules/bll/src/main/resources/ldap/rhds/getUserByPrincipalName.filter +++ b/backend/manager/modules/bll/src/main/resources/ldap/rhds/getUserByPrincipalName.filter @@ -1,6 +1,9 @@ <%@ options whitespace="ignore" %> +<%-- The 389 directory server doesn't have an UPN, so we need to use the + the user name without the domain part: --> + (& (objectClass=person) - (uid=${name}) + (uid=${name.split("@")[0]}) ) -- To view, visit http://gerrit.ovirt.org/14837 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0225783c2cca67a5518858f4c12bd2201286a84 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
