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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Dec  9 12:22:13 2013
New Revision: 71

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=71&view=rev
Log:
Merge basic/form JAAS flows and support IsPassive when set.

Added:
    trunk/src/main/config/system/flows/authn/jaas-authn-beans.xml
      - copied, changed from r66, trunk/src/main/config/system/flows/authn/jaas-form-authn-beans.xml
    trunk/src/main/config/system/flows/authn/jaas-authn-flow.xml
      - copied, changed from r66, trunk/src/main/config/system/flows/authn/jaas-form-authn-flow.xml
Modified:
    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/system/flows/authn/jaas-basic-authn-beans.xml
    trunk/src/main/config/system/flows/authn/jaas-basic-authn-flow.xml
    trunk/src/main/config/system/flows/authn/jaas-form-authn-beans.xml
    trunk/src/main/config/system/flows/authn/jaas-form-authn-flow.xml

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=71&r1=70&r2=71&view=diff
==============================================================================
--- trunk/src/main/config/conf/authn-flow-descriptors.xml (original)
+++ trunk/src/main/config/conf/authn-flow-descriptors.xml Mon Dec  9 12:22:13 2013
@@ -48,25 +48,10 @@
             </property>
         </bean>
 
-        <bean c:id="AuthenticationFlow/JAASForm" 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>
-
-        <bean c:id="AuthenticationFlow/JAASBasic" class="net.shibboleth.idp.authn.AuthenticationFlowDescriptor"
+        <bean c:id="AuthenticationFlow/JAAS" class="net.shibboleth.idp.authn.AuthenticationFlowDescriptor"
                 p:resultSerializer-ref="shibboleth.DefaultAuthenticationResultSerializer"
                 p:passiveAuthenticationSupported="true"
-                p:forcedAuthenticationSupported="false"
+                p:forcedAuthenticationSupported="true"
                 p:lifetime="${idp.authn.defaultLifetime}" p:inactivityTimeout="${idp.authn.defaultTimeout}">
             <property name="supportedPrincipals">
                 <list>
@@ -97,7 +82,7 @@
 
     <!--
     Define entries here to map error messages thrown by authentication plugins like JAAS modules
-    and classify them as particular kinds of errors for use in your templates.
+    and classify them as particular kinds of errors for use in your templates and as events in flows.
     -->
     <util:map id="shibboleth.ClassifiedMessageMap">
         <entry key="UnknownUsername">

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=71&r1=70&r2=71&view=diff
==============================================================================
--- trunk/src/main/config/conf/idp.properties (original)
+++ trunk/src/main/config/conf/idp.properties Mon Dec  9 12:22:13 2013
@@ -50,7 +50,7 @@
 idp.session.activeResultExtraction = net.shibboleth.idp.session.impl.ExtractActiveAuthenticationResults
 
 # Regular expression expressing flows to enable 
-idp.authn.flows = IPAddress|JAASForm
+idp.authn.flows = IPAddress|JAAS
 #idp.authn.flows = IPAddress|LDAP
 
 # Default lifetime and timeout of various authentication methods

Modified: trunk/src/main/config/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/conf/webflow-config.xml?rev=71&r1=70&r2=71&view=diff
==============================================================================
--- trunk/src/main/config/conf/webflow-config.xml (original)
+++ trunk/src/main/config/conf/webflow-config.xml Mon Dec  9 12:22:13 2013
@@ -35,8 +35,7 @@
         <!-- Login methods. -->
         <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/JAASForm" path="/authn/jaas-form-authn-flow.xml" />

[... 69 lines stripped ...]