[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties system/flows/saml2/sso-abs...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Dec 31 17:58:39 2013
New Revision: 5130

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5130&view=rev
Log:
Wire in SPSession maintainance as a test.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-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=5130&r1=5129&r2=5130&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Tue Dec 31 17:58:39 2013
@@ -48,6 +48,8 @@
 idp.session.trackSPSessions = false
 # Support lookup by SP for SAML logout
 idp.session.secondaryServiceIndex = false
+# Length of time to track SP sessions
+idp.session.defaultSPlifetime = PT2H
 
 # Select implementation for step that determines what results are active
 idp.session.activeResultExtraction = net.shibboleth.idp.session.impl.ExtractActiveAuthenticationResults

Modified: trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml?rev=5130&r1=5129&r2=5130&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml Tue Dec 31 17:58:39 2013
@@ -223,6 +223,11 @@
 
     <bean id="SelectProfileConfiguration" class="net.shibboleth.idp.profile.impl.SelectProfileConfiguration" scope="prototype"/>
 
+    <bean id="UpdateSessionWithSPSession" class="net.shibboleth.idp.session.impl.UpdateSessionWithSPSession" scope="prototype"
+            p:enabled="${idp.session.enabled}"
+            p:sessionManager-ref="shibboleth.SessionManager"
+            p:sessionLifetime="${idp.session.defaultSPlifetime}" />
+
     <bean id="AddAttributeStatementToAssertion" class="net.shibboleth.idp.saml.impl.profile.saml2.AddAttributeStatementToAssertion" />
     
     <bean id="AddAttributeRecipientContext" class="idp.AddAttributeRecipientContext" />

Modified: trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml?rev=5130&r1=5129&r2=5130&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml Tue Dec 31 17:58:39 2013
@@ -72,10 +72,15 @@
     
     <action-state id="FilterAttributes">
         <evaluate expression="FilterAttributes" />
+        <transition on="proceed" to="UpdateSessionWithSPSession"/>
+    </action-state>
+
+    <action-state id="UpdateSessionWithSPSession">
+        <evaluate expression="UpdateSessionWithSPSession" />
         <transition on="proceed" to="BuildResponse"/>
+        <!-- Mask storage failure. -->
+        <transition on="IOError" to="BuildResponse"/>
     </action-state>
-    
-    <!-- TODO filter attributes -->
        
     <action-state id="BuildResponse">
         <evaluate expression="BuildResponse" />