[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties conf/ipaddress-authn-confi...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Nov  4 23:35:19 2013
New Revision: 4936

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4936&view=rev
Log:
Sync with testbed

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml
    trunk/idp-conf/src/main/resources/flows/authn/authn-abstract-flow.xml
    trunk/idp-conf/src/main/resources/flows/authn/authn-flow.xml
    trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-flow.xml

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=4936&r1=4935&r2=4936&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Mon Nov  4 23:35:19 2013
@@ -42,7 +42,7 @@
 idp.session.secondaryServiceIndex = false
 
 # Regular expression expressing flows to enable 
-idp.authn.flows = JAASForm
+idp.authn.flows = IPAddress|JAASForm
 
 # Default lifetime and timeout of various authentication methods
 idp.authn.defaultLifetime = PT60M

Modified: trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml?rev=4936&r1=4935&r2=4936&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml Mon Nov  4 23:35:19 2013
@@ -28,12 +28,14 @@
     <!-- You can configure the address range(s) and principal name(s) for IP-based login here. -->
 
     <util:map id="shibboleth.authn.IPAddress.Mappings">
+        <!--
         <entry key="jdoe">
             <list>
                 <value>127.0.0.1/32</value>
                 <value>::1/128</value>
             </list>
         </entry>
+        -->
     </util:map>
 
 </beans>

Modified: trunk/idp-conf/src/main/resources/flows/authn/authn-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/authn-abstract-flow.xml?rev=4936&r1=4935&r2=4936&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/authn-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/authn-abstract-flow.xml Mon Nov  4 23:35:19 2013
@@ -15,6 +15,7 @@
     <end-state id="NoCredentials" />
     <end-state id="NoPotentialFlow" />
     <end-state id="RequestUnsupported" />
+    <end-state id="ReselectFlow" />
     <end-state id="SubjectCanonicalizationError" />
 
     <!-- Default is to turn any event into its own end-state. -->

Modified: trunk/idp-conf/src/main/resources/flows/authn/authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/authn-flow.xml?rev=4936&r1=4935&r2=4936&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/authn-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/authn-flow.xml Mon Nov  4 23:35:19 2013
@@ -58,6 +58,7 @@
     is an error, otherwise control passes to the wrap-up actions.
     -->
     <subflow-state id="CallAuthenticationFlow" subflow="#{currentEvent.id}">
+        <transition on="ReselectFlow" to="SelectAuthenticationFlow" />
         <transition on="proceed" to="InvalidateSessionOnIdentitySwitch" />
     </subflow-state>
 

Modified: trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-flow.xml?rev=4936&r1=4935&r2=4936&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-flow.xml Mon Nov  4 23:35:19 2013
@@ -24,6 +24,12 @@
         
         <transition on="proceed" to="CallSubjectCanonicalization" />
     </action-state>
+
+    <!-- As a "fall-through" method, remap selected events to select a different flow. -->    
+    <global-transitions>
+        <transition on="NoCredentials" to="ReselectFlow" />
+        <transition on="InvalidCredentials" to="ReselectFlow" />
+    </global-transitions>
     
     <bean-import resource="ipaddress-authn-beans.xml" />