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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Dec 10 14:20:44 2013
New Revision: 5022

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5022&view=rev
Log:
Add LDAP flow from testbed.

Added:
    trunk/idp-conf/src/main/resources/conf/ldap-authn-config.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml
    trunk/idp-conf/src/main/resources/conf/webflow-config.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml?rev=5022&r1=5021&r2=5022&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml Tue Dec 10 14:20:44 2013
@@ -63,6 +63,21 @@
             </property>
         </bean>
 
+        <bean c:id="AuthenticationFlow/LDAP" class="net.shibboleth.idp.authn.AuthenticationFlowDescriptor"
+                p:resultSerializer-ref="shibboleth.DefaultAuthenticationResultSerializer"
+                p:passiveAuthenticationSupported="true"
+                p:forcedAuthenticationSupported="true"
+                p:lifetime="${idp.authn.defaultLifetime}" p:inactivityTimeout="${idp.authn.defaultTimeout}">
+            <property name="supportedPrincipals">
+                <list>
+                    <bean class="net.shibboleth.idp.saml.authn.AuthnContextClassRefPrincipal"
+                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" />
+                    <bean class="net.shibboleth.idp.saml.authn.AuthnContextClassRefPrincipal"
+                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:Password" />
+                </list>
+            </property>
+        </bean>
+
     </util:list>
 
     <!--
@@ -80,6 +95,16 @@
             <list>
                 <value>PREAUTH_FAILED</value>
                 <value>INVALID_CREDENTIALS</value>
+            </list>
+        </entry>
+        <entry key="ExpiredPassword">
+            <list>
+                <value>PASSWORD_EXPIRED</value>
+            </list>
+        </entry>
+        <entry key="ExpiringPassword">
+            <list>
+                <value>ACCOUNT_WARNING</value>
             </list>
         </entry>
     </util:map>

Modified: trunk/idp-conf/src/main/resources/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/webflow-config.xml?rev=5022&r1=5021&r2=5022&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/webflow-config.xml Tue Dec 10 14:20:44 2013
@@ -27,6 +27,7 @@
         <webflow:flow-location id="AuthenticationFlow/IPAddress" path="/authn/ipaddress-authn-flow.xml" />
         <webflow:flow-location id="AuthenticationFlow/RemoteUser" path="/authn/remoteuser-authn-flow.xml" />
         <webflow:flow-location id="AuthenticationFlow/JAAS" path="/authn/jaas-authn-flow.xml" />
+        <webflow:flow-location id="AuthenticationFlow/LDAP" path="/authn/ldap-authn-flow.xml" />
         
         <!-- C14N methods. -->
         <webflow:flow-location id="SubjectC14N/Simple" path="/authn/simple-subject-c14n-flow.xml" />