[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/ipaddress-authn-config.xml system/flows/s...

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Jan 21 16:43:16 2014
New Revision: 5223

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5223&view=rev
Log:
Wire IPAddress authentication to SAML1 flow via the "dev" profile.

Modified:
    trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml

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=5223&r1=5222&r2=5223&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 Tue Jan 21 16:43:16 2014
@@ -37,4 +37,19 @@
         -->
     </util:map>
 
+
+    <!-- Bean definitions for tests. This will probably change. -->
+    <beans profile="dev">
+        
+        <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>
+
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml?rev=5223&r1=5222&r2=5223&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml Tue Jan 21 16:43:16 2014
@@ -48,7 +48,9 @@
         class="net.shibboleth.idp.saml.profile.config.saml1.BrowserSSOProfileConfiguration"
         p:securityConfiguration-ref="SecurityConfiguration" />
 
+    <!-- TODO replace configurationId with something else -->
     <!-- TODO replace responderId "https://idp.example.org" with something else -->
+    <!-- TODO replace predicate with something else -->
     <bean
         id="ConditionalRelyingPartyConfiguration"
         class="net.shibboleth.idp.relyingparty.impl.ConditionalRelyingPartyConfiguration"
@@ -61,6 +63,11 @@
     <bean
         id="SelectProfileConfiguration"
         class="net.shibboleth.idp.profile.impl.SelectProfileConfiguration"
+        scope="prototype" />
+
+    <bean
+        id="InitializeAuthenticationContext"
+        class="net.shibboleth.idp.saml.impl.profile.InitializeAuthenticationContext"
         scope="prototype" />
 
     <bean

Modified: trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml?rev=5223&r1=5222&r2=5223&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml Tue Jan 21 16:43:16 2014
@@ -34,8 +34,18 @@
 
     <action-state id="SelectProfileConfiguration">
         <evaluate expression="SelectProfileConfiguration" />
+        <transition on="proceed" to="InitializeAuthenticationContext" />
+    </action-state>
+    
+    <action-state id="InitializeAuthenticationContext">
+        <evaluate expression="InitializeAuthenticationContext" />
+        <transition on="proceed" to="DoAuthenticationSubflow" />
+    </action-state>
+    
+    <subflow-state id="DoAuthenticationSubflow" subflow="Authentication">
         <transition on="proceed" to="RecordResponseComplete" />
-    </action-state>
+        <transition on="#{true}" to="RecordResponseComplete" />
+    </subflow-state>
 
     <!-- TODO actions -->