[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml

[noreply at shibboleth.net]

Author: scantor
Date: Fri May 29 23:33:09 2015
New Revision: 7544

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7544&view=rev
Log:
IDP-730 - Add trimming to DN and filter properties

Modified:
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml?rev=7544&r1=7543&r2=7544&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml	Fri May 29 23:33:09 2015
@@ -72,8 +72,10 @@
         <constructor-arg index="0" ref="anonSearchDnResolver" />
         <constructor-arg index="1" ref="authHandler" />
     </bean>
-    <bean id="anonSearchDnResolver" class="org.ldaptive.auth.PooledSearchDnResolver" p:baseDn="%{idp.authn.LDAP.baseDN}"
-        p:subtreeSearch="%{idp.authn.LDAP.subtreeSearch:false}" p:userFilter="%{idp.authn.LDAP.userFilter}"
+    <bean id="anonSearchDnResolver" class="org.ldaptive.auth.PooledSearchDnResolver"
+        p:baseDn="#{'%{idp.authn.LDAP.baseDN}'.trim()}"
+        p:subtreeSearch="%{idp.authn.LDAP.subtreeSearch:false}"
+        p:userFilter="#{'%{idp.authn.LDAP.userFilter}'.trim()}"
         p:connectionFactory-ref="anonSearchPooledConnectionFactory" />
     <bean id="anonSearchPooledConnectionFactory" class="org.ldaptive.pool.PooledConnectionFactory"
         p:connectionPool-ref="anonSearchConnectionPool" />
@@ -87,8 +89,10 @@
         <constructor-arg index="0" ref="bindSearchDnResolver" />
         <constructor-arg index="1" ref="authHandler" />
     </bean>
-    <bean id="bindSearchDnResolver" class="org.ldaptive.auth.PooledSearchDnResolver" p:baseDn="%{idp.authn.LDAP.baseDN}"
-        p:subtreeSearch="%{idp.authn.LDAP.subtreeSearch:false}" p:userFilter="%{idp.authn.LDAP.userFilter}"
+    <bean id="bindSearchDnResolver" class="org.ldaptive.auth.PooledSearchDnResolver"
+        p:baseDn="#{'%{idp.authn.LDAP.baseDN}'.trim()}"
+        p:subtreeSearch="%{idp.authn.LDAP.subtreeSearch:false}"
+        p:userFilter="#{'%{idp.authn.LDAP.userFilter}'.trim()}"
         p:connectionFactory-ref="bindSearchPooledConnectionFactory" />
     <bean id="bindSearchPooledConnectionFactory" class="org.ldaptive.pool.PooledConnectionFactory"
         p:connectionPool-ref="bindSearchConnectionPool" />
@@ -96,7 +100,8 @@
         p:connectionFactory-ref="bindSearchConnectionFactory" p:name="search-pool" />
     <bean id="bindSearchConnectionFactory" class="org.ldaptive.DefaultConnectionFactory" p:connectionConfig-ref="bindSearchConnectionConfig" />
     <bean id="bindSearchConnectionConfig" parent="connectionConfig" p:connectionInitializer-ref="bindConnectionInitializer" />
-    <bean id="bindConnectionInitializer" class="org.ldaptive.BindConnectionInitializer" p:bindDn="%{idp.authn.LDAP.bindDN}">
+    <bean id="bindConnectionInitializer" class="org.ldaptive.BindConnectionInitializer"
+            p:bindDn="#{'%{idp.authn.LDAP.bindDN}'.trim()}">
         <property name="bindCredential">
             <bean class="org.ldaptive.Credential">
                 <constructor-arg value="%{idp.authn.LDAP.bindDNCredential}" />