[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: Fri Jul 18 01:09:47 2014
New Revision: 6306

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6306&view=rev
Log:
Add common LDAP authentication configurations.
  * Anonymous search and bind
  * Authenticated search and bind
  * Direct search and bind (known DN format)
  * Active Directory
Resolves IDP-441.

Added:
    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-direct-config.xml
Modified:
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
    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=6306&r1=6305&r2=6306&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 Jul 18 01:09:47 2014
@@ -13,12 +13,37 @@
        default-destroy-method="destroy">
        
     <!-- LDAP configuration. -->
-    
-    <bean id="shibboleth.authn.LDAP.ldapUrl" class="java.lang.String" c:_0="ldap://localhost:10389" />
-    <bean id="shibboleth.authn.LDAP.baseDn" class="java.lang.String" c:_0="ou=people,dc=example,dc=org" />
+    <!-- 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="ldap://localhost:389" />
+    <util:constant id="shibboleth.authn.LDAP.useStartTLS" static-field="java.lang.Boolean.TRUE"/>
+    <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="ou=people,dc=shibboleth,dc=net" />
+    <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" />
 
-    <util:constant id="shibboleth.authn.LDAP.subtreeSearch" static-field="java.lang.Boolean.FALSE"/>
+    <!-- Required for ldap-authn-bind-config -->
+    <bean id="shibboleth.authn.LDAP.bindDN" class="java.lang.String" c:_0="cn=manager" />
+    <bean id="shibboleth.authn.LDAP.bindCredential" class="java.lang.String" c:_0="password" />
+
+    <!-- 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,ou=people,dc=shibboleth,dc=net" />
+
+    <!-- Common pooling configuration used for DN resolution and binding -->
+    <bean id="shibboleth.authn.LDAP.pool.minSize" class="java.lang.Integer" c:_0="3" />
+    <bean id="shibboleth.authn.LDAP.pool.maxSize" class="java.lang.Integer" c:_0="10" />
+    <util:constant id="shibboleth.authn.LDAP.pool.validateOnCheckout" static-field="java.lang.Boolean.FALSE"/>
+    <util:constant id="shibboleth.authn.LDAP.pool.validatePeriodically" static-field="java.lang.Boolean.TRUE"/>
+    <bean id="shibboleth.authn.LDAP.pool.validatePeriod" class="java.lang.Long" c:_0="300" />
+    <bean id="shibboleth.authn.LDAP.pool.prunePeriod" class="java.lang.Long" c:_0="300" />
+    <bean id="shibboleth.authn.LDAP.pool.idleTime" class="java.lang.Long" c:_0="600" />
+    <bean id="shibboleth.authn.LDAP.pool.blockWaitTime" class="java.lang.Long" c:_0="3000" />
 
     <util:list id="shibboleth.authn.LDAP.returnAttributes">
         <value>cn</value>

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml?rev=6306&r1=6305&r2=6306&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml Fri Jul 18 01:09:47 2014
@@ -62,55 +62,5 @@
         p:classifiedMessages-ref="shibboleth.authn.Password.ClassifiedMessageMap"
         p:resultCachingPredicate="#{getObject('shibboleth.authn.Password.resultCachingPredicate')}"

[... 54 lines stripped ...]