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

[noreply at shibboleth.net]

Author: dfisher
Date: Tue Oct 14 01:06:51 2014
New Revision: 6687

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6687&view=rev
Log:
Consolidate all LDAP authn configuration in a single file and default lazy-init to true.
Leverage an alias with a property for conditionally selecting which authenticator to
 use.
Add more configuration properties to ldap.properties.

Modified:
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-ad-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-anon-search-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-bind-search-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-common-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-direct-config.xml
    trunk/idp-conf/src/main/resources/conf/ldap.properties
    trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.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=6687&r1=6686&r2=6687&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 Tue Oct 14 01:06:51 2014
@@ -1,56 +1,101 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-       
-    <!-- LDAP configuration. -->
-    <!-- Choose an import based on how you resolve DNs in your LDAP -->
-    <import resource="ldap-authn-anon-search-config.xml" />
-    <!-- <import resource="ldap-authn-bind-search-config.xml" /> -->
-    <!-- <import resource="ldap-authn-direct-config.xml" /> -->
-    <!-- <import resource="ldap-authn-ad-config.xml" /> -->
 
-    <!-- Common LDAP authn configuration -->
-    <bean id="shibboleth.authn.LDAP.ldapUrl" class="java.lang.String" c:_0="%{idp.authn.LDAP.ldapURL}" />
-    <util:constant id="shibboleth.authn.LDAP.useStartTLS" static-field="java.lang.Boolean.FALSE"/>
-    <util:constant id="shibboleth.authn.LDAP.useSSL" static-field="java.lang.Boolean.FALSE"/>
-    <bean id="shibboleth.authn.LDAP.baseDn" class="java.lang.String" c:_0="%{idp.authn.LDAP.baseDN}" />
-    <util:constant id="shibboleth.authn.LDAP.subtreeSearch" static-field="java.lang.Boolean.FALSE"/>
-    <bean id="shibboleth.authn.LDAP.userFilter" class="java.lang.String" c:_0="(uid={user})" />
-    <bean id="shibboleth.authn.LDAP.connectTimeout" class="java.lang.Integer" c:_0="3000" />
+    default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
 
-    <!-- Required for ldap-authn-bind-search-config -->
-    <bean id="shibboleth.authn.LDAP.bindDN" class="java.lang.String" c:_0="%{idp.authn.LDAP.bindDN}" />
-    <bean id="shibboleth.authn.LDAP.bindCredential" class="java.lang.String" c:_0="%{idp.authn.LDAP.bindDNCredential}" />
+    <alias name="%{idp.authn.LDAP.authenticator}" alias="shibboleth.authn.LDAP.authenticator" />
+    <bean id="shibboleth.authn.LDAP.returnAttributes" class="org.springframework.util.StringUtils" factory-method="commaDelimitedListToStringArray">
+        <constructor-arg type="java.lang.String" value="%{idp.authn.LDAP.returnAttributes}" />
+    </bean>
 
-    <!-- Required for ldap-authn-direct-config and ldap-authn-ad-config; use %s at domain.com for AD -->
-    <bean id="shibboleth.authn.LDAP.dn-format" class="java.lang.String" c:_0="uid=%s,%{idp.authn.LDAP.baseDN}" />
+    <alias name="ValidateUsernamePasswordAgainstLDAP" alias="ValidateUsernamePassword" />
 

[... 168 lines stripped ...]