[java-identity-provider COMMIT] /trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resol...

[noreply at shibboleth.net]

Author: dfisher
Date: Thu Jul 31 17:58:29 2014
New Revision: 6376

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6376&view=rev
Log:
Optimize the search validator created for v2 configs.
Add some defaults that were present in v2.

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java?rev=6376&r1=6375&r2=6376&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java Thu Jul 31 17:58:29 2014
@@ -42,6 +42,7 @@
 import org.ldaptive.SearchExecutor;
 import org.ldaptive.SearchFilter;
 import org.ldaptive.SearchRequest;
+import org.ldaptive.SearchScope;
 import org.ldaptive.handler.CaseChangeEntryHandler;
 import org.ldaptive.handler.CaseChangeEntryHandler.CaseChange;
 import org.ldaptive.handler.MergeAttributeEntryHandler;
@@ -460,15 +461,22 @@
 
             final BeanDefinitionBuilder searchRequest =
                     BeanDefinitionBuilder.genericBeanDefinition(SearchRequest.class);
+            searchRequest.addPropertyValue("returnAttributes", "1.1");
+            searchRequest.addPropertyValue("searchScope", SearchScope.OBJECT);
+            searchRequest.addPropertyValue("sizeLimit", 1);
             if (validateDN != null) {
                 searchRequest.addPropertyValue("baseDn", validateDN);
-            }
+            } else {
+                searchRequest.addPropertyValue("baseDn", "");
+            }
+            final BeanDefinitionBuilder searchFilter =
+                    BeanDefinitionBuilder.genericBeanDefinition(SearchFilter.class);
             if (validateFilter != null) {
-                final BeanDefinitionBuilder searchFilter =
-                        BeanDefinitionBuilder.genericBeanDefinition(SearchFilter.class);
                 searchFilter.addConstructorArgValue(validateFilter);
-                searchRequest.addPropertyValue("searchFilter", searchFilter.getBeanDefinition());
-            }
+            } else {
+                searchFilter.addConstructorArgValue("(objectClass=*)");
+            }
+            searchRequest.addPropertyValue("searchFilter", searchFilter.getBeanDefinition());
             final BeanDefinitionBuilder validator = BeanDefinitionBuilder.genericBeanDefinition(SearchValidator.class);
             validator.addPropertyValue("searchRequest", searchRequest.getBeanDefinition());
             pool.addPropertyValue("validator", validator.getBeanDefinition());