[java-idp-testbed COMMIT] in /trunk: pom.xml src/main/config/conf/authn-flow-descriptors.xml src/main/config/conf/idp...

[noreply at shibboleth.net]

Author: dfisher
Date: Thu Dec  5 23:13:57 2013
New Revision: 65

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=65&view=rev
Log:
Add an LDAP authentication flow with support for mock account states.

Added:
    trunk/src/main/config/conf/ldap-authn-config.xml
    trunk/src/main/config/system/flows/authn/ldap-authn-beans.xml
    trunk/src/main/config/system/flows/authn/ldap-authn-flow.xml
    trunk/src/main/java/idp/MockAuthenticationResponseHandler.java
Modified:
    trunk/pom.xml
    trunk/src/main/config/conf/authn-flow-descriptors.xml
    trunk/src/main/config/conf/idp.properties
    trunk/src/main/config/conf/webflow-config.xml
    trunk/src/main/config/views/login.vm

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/pom.xml?rev=65&r1=64&r2=65&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Thu Dec  5 23:13:57 2013
@@ -161,6 +161,17 @@
             <artifactId>guava</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.ldaptive</groupId>
+            <artifactId>ldaptive</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.unboundid</groupId>
+            <artifactId>unboundid-ldapsdk</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
         <!-- Provided scope -->
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -195,11 +206,6 @@
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-jsp</artifactId>
             <version>${jetty.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ldaptive</groupId>
-            <artifactId>ldaptive</artifactId>
             <scope>runtime</scope>
         </dependency>
 

Modified: trunk/src/main/config/conf/authn-flow-descriptors.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/conf/authn-flow-descriptors.xml?rev=65&r1=64&r2=65&view=diff
==============================================================================
--- trunk/src/main/config/conf/authn-flow-descriptors.xml (original)
+++ trunk/src/main/config/conf/authn-flow-descriptors.xml Thu Dec  5 23:13:57 2013
@@ -78,6 +78,21 @@
             </property>
         </bean>
 
+        <bean c:id="AuthenticationFlow/LDAP" class="net.shibboleth.idp.authn.AuthenticationFlowDescriptor"
+                p:resultSerializer-ref="shibboleth.DefaultAuthenticationResultSerializer"
+                p:passiveAuthenticationSupported="false"
+                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>
 
     <!--
@@ -95,6 +110,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/src/main/config/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/conf/idp.properties?rev=65&r1=64&r2=65&view=diff
==============================================================================
--- trunk/src/main/config/conf/idp.properties (original)
+++ trunk/src/main/config/conf/idp.properties Thu Dec  5 23:13:57 2013
@@ -51,6 +51,7 @@
 
 # Regular expression expressing flows to enable 
 idp.authn.flows = IPAddress|JAASForm
+#idp.authn.flows = IPAddress|LDAP
 
 # Default lifetime and timeout of various authentication methods
 idp.authn.defaultLifetime = PT60M
@@ -59,3 +60,10 @@
 # Whether to prioritize "active" results when an SP requests more than
 # one possible matching login method (V2 behavior was to favor them)
 idp.authn.favorSSO = false
+
+# LDAP authentication configuration
+# uses the in-memory directory by default, see src/test/config/ldap.ldif
+idp.authn.ldap.ldapUrl = ldap://localhost:10389
+idp.authn.ldap.baseDn = ou=people,dc=shibboleth,dc=net
+idp.authn.ldap.subtreeSearch = false
+idp.authn.ldap.userFilter = (uid={user})

Modified: trunk/src/main/config/conf/webflow-config.xml

[... 44 lines stripped ...]