[java-identity-provider] branch master updated: IDP-1178 unnecessary LDAP filter
Daniel Fisher
dfisher at vt.edu
Thu Jun 1 01:29:43 EDT 2017
This is an automated email from the git hooks/post-receive script.
dfisher pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=6d96019bba9f7f151ccd5d5129d73347b9a183f3
The following commit(s) were added to refs/heads/master by this push:
new 6d96019 IDP-1178 unnecessary LDAP filter
6d96019 is described below
commit 6d96019bba9f7f151ccd5d5129d73347b9a183f3
Author: Daniel Fisher <dfisher at gmail.com>
AuthorDate: Thu Jun 1 01:27:41 2017 -0400
IDP-1178 unnecessary LDAP filter
Remove wiring of filter in search executor.
Update unit tests to confirm filter is null.
---
.../resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java | 8 --------
.../resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java | 6 +++---
.../spring/dc/ldap/ldap-attribute-resolver-spring-context.xml | 6 +-----
.../dc/ldap/ldap-attribute-resolver-spring-props-context.xml | 8 ++------
.../resolver/spring/dc/ldap/ldap-attribute-resolver-v2-props.xml | 2 +-
.../idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties | 2 +-
.../idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties | 2 +-
7 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
index 115535a..7dec6a4 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
@@ -486,14 +486,6 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
searchExecutor.addPropertyValue("returnAttributes", returnAttrs.getBeanDefinition());
}
- final String filterText = getFilterText();
- if (filterText != null) {
- final BeanDefinitionBuilder searchFilter =
- BeanDefinitionBuilder.genericBeanDefinition(SearchFilter.class);
- searchFilter.addConstructorArgValue(filterText);
- searchExecutor.addPropertyValue("searchFilter", searchFilter.getBeanDefinition());
- }
-
return searchExecutor.getBeanDefinition();
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
index 03b194f..b036452 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
@@ -198,7 +198,7 @@ public class LDAPDataConnectorParserTest {
final SearchExecutor searchExecutor = dataConnector.getSearchExecutor();
AssertJUnit.assertNotNull(searchExecutor);
AssertJUnit.assertEquals("", searchExecutor.getBaseDn());
- AssertJUnit.assertNotNull(searchExecutor.getSearchFilter().getFilter());
+ AssertJUnit.assertNull(searchExecutor.getSearchFilter());
AssertJUnit.assertEquals(3000, searchExecutor.getTimeLimit());
final ConnectionFactoryValidator validator = (ConnectionFactoryValidator) dataConnector.getValidator();
@@ -273,7 +273,7 @@ public class LDAPDataConnectorParserTest {
final SearchExecutor searchExecutor = dataConnector.getSearchExecutor();
AssertJUnit.assertNotNull(searchExecutor);
AssertJUnit.assertEquals("", searchExecutor.getBaseDn());
- AssertJUnit.assertNotNull(searchExecutor.getSearchFilter().getFilter());
+ AssertJUnit.assertNull(searchExecutor.getSearchFilter());
AssertJUnit.assertEquals(3000, searchExecutor.getTimeLimit());
final ConnectionFactoryValidator validator = (ConnectionFactoryValidator) dataConnector.getValidator();
@@ -505,7 +505,7 @@ public class LDAPDataConnectorParserTest {
final SearchExecutor searchExecutor = dataConnector.getSearchExecutor();
AssertJUnit.assertNotNull(searchExecutor);
AssertJUnit.assertEquals("ou=people,dc=shibboleth,dc=net", searchExecutor.getBaseDn());
- AssertJUnit.assertNotNull(searchExecutor.getSearchFilter().getFilter());
+ AssertJUnit.assertNull(searchExecutor.getSearchFilter());
AssertJUnit.assertEquals(7000, searchExecutor.getTimeLimit());
final ConnectionFactoryValidator validator = (ConnectionFactoryValidator) dataConnector.getValidator();
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml
index d633513..b6b484f 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml
@@ -62,11 +62,7 @@
</bean>
</property>
</bean>
- <bean class="org.ldaptive.SearchExecutor" p:baseDn="ou=people,dc=shibboleth,dc=net" p:returnAttributes="uid,homephone,mail" p:timeLimit="7000">
- <property name="searchFilter">
- <bean class="org.ldaptive.SearchFilter" p:filter="(uid=${recipientContext.principal})" />
- </property>
- </bean>
+ <bean class="org.ldaptive.SearchExecutor" p:baseDn="ou=people,dc=shibboleth,dc=net" p:returnAttributes="uid,homephone,mail" p:timeLimit="7000" />
<bean id="cache" class="com.google.common.cache.Cache" factory-bean="cacheBuilderExternal" factory-method="build" />
<bean class="net.shibboleth.idp.attribute.resolver.dc.ldap.impl.TemplatedExecutableSearchFilterBuilder"
p:templateText="(uid=${resolutionContext.principal})" p:velocityEngine-ref="shibboleth.VelocityEngine"
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-props-context.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-props-context.xml
index ad9b153..23b4676 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-props-context.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-props-context.xml
@@ -68,17 +68,13 @@
</bean>
</property>
</bean>
- <bean class="org.ldaptive.SearchExecutor" p:baseDn="%{search.baseDn}" p:returnAttributes="%{search.returnAttributes}" p:timeLimit="%{search.timeLimit}">
- <property name="searchFilter">
- <bean class="org.ldaptive.SearchFilter" p:filter="%{search.filter}" />
- </property>
- </bean>
+ <bean class="org.ldaptive.SearchExecutor" p:baseDn="%{search.baseDn}" p:returnAttributes="%{search.returnAttributes}" p:timeLimit="%{search.timeLimit}" />
<bean id="cacheBuilder" class="com.google.common.cache.CacheBuilder" factory-method="from">
<constructor-arg value="%{cache.cacheBuilderSpec}" />
</bean>
<bean id="cache" class="com.google.common.cache.Cache" factory-bean="cacheBuilder" factory-method="build" />
<bean class="net.shibboleth.idp.attribute.resolver.dc.ldap.impl.TemplatedExecutableSearchFilterBuilder"
- p:templateText="(uid=${resolutionContext.principal})" p:velocityEngine-ref="shibboleth.VelocityEngine"
+ p:templateText="%{search.filter}" p:velocityEngine-ref="shibboleth.VelocityEngine"
init-method="initialize" />
<bean id="mappings" class="net.shibboleth.idp.attribute.resolver.dc.ldap.impl.StringAttributeValueMappingStrategy"
p:noResultAnError="%{noResultIsError}" p:multipleResultsAnError="%{multipleResultsIsError}">
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2-props.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2-props.xml
index ba9a753..aa7df03 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2-props.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2-props.xml
@@ -21,7 +21,7 @@
responseTimeout="%{connectionConfig.responseTimeout}">
<dc:FilterTemplate>
<![CDATA[
- (uid=${resolutionContext.principal})
+ %{search.filter}
]]>
</dc:FilterTemplate>
<dc:ReturnAttributes>%{search.returnAttributes}</dc:ReturnAttributes>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties
index 77b8fef..c1a509c 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties
@@ -10,7 +10,7 @@ multipleResultsIsError=true
noRetryDelay=PT5M
search.baseDn=ou=people,dc=shibboleth,dc=net
-search.filter=(uid=${recipientContext.principal})
+search.filter=(uid=${resolutionContext.principal})
search.returnAttributes=uid,homephone,mail
search.timeLimit=PT7S
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties
index e064a2f..69203de 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties
@@ -10,7 +10,7 @@ multipleResultsIsError=true
noRetryDelay=PT5M
search.baseDn=ou=people,dc=shibboleth,dc=net
-search.filter=(uid=${recipientContext.principal})
+search.filter=(uid=${resolutionContext.principal})
search.returnAttributes=uid,homephone,mail
search.timeLimit=7000
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list