[java-identity-provider COMMIT] in /trunk: idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/UpdateSessionWi...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct 14 13:07:54 2013
New Revision: 4855

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4855&view=rev
Log:
IDP-109: action that creates/updates user session based on authentication result

Added:
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithAuthenticationResult.java
      - copied, changed from r4849, trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/UpdateSessionWithAuthenticationResult.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/UpdateSessionWithAuthenticationResultTest.java   (with props)
Modified:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/UpdateSessionWithAuthenticationResult.java
    trunk/idp-conf/src/main/resources/flows/authn/authn-beans.xml
    trunk/idp-conf/src/main/resources/flows/authn/authn-flow.xml

Modified: trunk/idp-conf/src/main/resources/flows/authn/authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/authn-beans.xml?rev=4855&r1=4854&r2=4855&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/authn-beans.xml Mon Oct 14 13:07:54 2013
@@ -40,6 +40,6 @@
     
     <bean id="FinalizeAuthentication" class="net.shibboleth.idp.authn.impl.FinalizeAuthentication" scope="prototype" />
     
-    <!-- TODO: action to copy result back to session. -->
+    <bean id="UpdateSessionWithAuthenticationResult" class="net.shibboleth.idp.session.impl.UpdateSessionWithAuthenticationResult" scope="prototype" />
     
 </beans>

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=4855&r1=4854&r2=4855&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 Oct 14 13:07:54 2013
@@ -74,6 +74,16 @@
     <!-- Wraps up the subflow by producing a SubjectContext. -->
     <action-state id="FinalizeAuthentication">
         <evaluate expression="FinalizeAuthentication" />
+        
+        <transition on="proceed" to="UpdateSessionWithAuthenticationResult" />
+    </action-state>
+    
+    <!-- Finally, create/update the client session. -->
+    <action-state id="UpdateSessionWithAuthenticationResult">
+        <evaluate expression="UpdateSessionWithAuthenticationResult" />
+        
+        <!-- By default, ignore any session layer errors at this stage. -->
+        <transition on="InputOutputError" to="proceed" />
     </action-state>
 
     <!-- Successful completion of subflow. -->

Copied: trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithAuthenticationResult.java (from r4849, trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/UpdateSessionWithAuthenticationResult.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithAuthenticationResult.java?p2=trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithAuthenticationResult.java&p1=trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/UpdateSessionWithAuthenticationResult.java&r1=4849&r2=4855&rev=4855&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/UpdateSessionWithAuthenticationResult.java (original)
+++ trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithAuthenticationResult.java Mon Oct 14 13:07:54 2013
@@ -15,108 +15,169 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.authn.impl;
+package net.shibboleth.idp.session.impl;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
-import net.shibboleth.ext.spring.webflow.Event;
-import net.shibboleth.ext.spring.webflow.Events;
 import net.shibboleth.idp.authn.AbstractAuthenticationAction;
 import net.shibboleth.idp.authn.AuthenticationException;
 import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.profile.ActionSupport;
+import net.shibboleth.idp.session.IdPSession;
+import net.shibboleth.idp.session.SessionException;
+import net.shibboleth.idp.session.SessionManager;
+import net.shibboleth.idp.session.context.SessionContext;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.utilities.java.support.logic.Constraint;
 
+import org.opensaml.profile.action.ActionSupport;

[... 218 lines stripped ...]