[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/conf: attribute-resolver-full.xml attribute-res...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb  9 21:11:00 2015
New Revision: 7330

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7330&view=rev
Log:
IDP-599 - Turn LDAP search filter into a property.

Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
    trunk/idp-conf/src/main/resources/conf/ldap.properties

Modified: trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml?rev=7330&r1=7329&r2=7330&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml Mon Feb  9 21:11:00 2015
@@ -283,7 +283,7 @@
         useStartTLS="%{idp.attribute.resolver.LDAP.useStartTLS:true}">
         <dc:FilterTemplate>
             <![CDATA[
-                (uid=${requestContext.principalName})
+                %{idp.attribute.resolver.LDAP.searchFilter}
             ]]>
         </dc:FilterTemplate>
         <dc:StartTLSTrustCredential id="LDAPtoIdPCredential" xsi:type="sec:X509Filesystem">

Modified: trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml?rev=7330&r1=7329&r2=7330&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml Mon Feb  9 21:11:00 2015
@@ -85,7 +85,7 @@
         useStartTLS="%{idp.attribute.resolver.LDAP.useStartTLS:true}">
         <dc:FilterTemplate>
             <![CDATA[
-                (uid=${requestContext.principalName})
+                %{idp.attribute.resolver.LDAP.searchFilter}
             ]]>
         </dc:FilterTemplate>
         <dc:StartTLSTrustCredential id="LDAPtoIdPCredential" xsi:type="sec:X509Filesystem">

Modified: trunk/idp-conf/src/main/resources/conf/ldap.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/ldap.properties?rev=7330&r1=7329&r2=7330&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/ldap.properties Mon Feb  9 21:11:00 2015
@@ -42,6 +42,7 @@
 idp.attribute.resolver.LDAP.bindDNCredential    = %{idp.authn.LDAP.bindDNCredential}
 idp.attribute.resolver.LDAP.useStartTLS         = %{idp.authn.LDAP.useStartTLS:true}
 idp.attribute.resolver.LDAP.trustCertificates   = %{idp.authn.LDAP.trustCertificates}
+idp.attribute.resolver.LDAP.searchFilter        = (uid=$requestContext.principalName)
 
 # LDAP pool configuration, used for both authn and DN resolution
 #idp.pool.LDAP.minSize                          = 3