[java-identity-provider COMMIT] in /trunk: idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicke...

[noreply at shibboleth.net]

Author: serac
Date: Fri Jan 15 07:27:32 2016
New Revision: 8076

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8076&view=rev
Log:
IDP-903 Store authn data and session ID with ticket.

Store all data required on back-channel ticket validation step during login
flow in new TicketState class that is attached to and persisted with the
ticket.

Added:
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/TicketServiceEx.java
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/TicketState.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/serialization/
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/serialization/impl/
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/serialization/impl/ProxyGrantingTicketSerializerTest.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/serialization/impl/ProxyTicketSerializerTest.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/serialization/impl/ServiceTicketSerializerTest.java
Modified:
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ServiceTicket.java
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/Ticket.java
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/TicketService.java
    trunk/idp-cas-impl/pom.xml
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildProxyChainAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildSamlValidationSuccessMessageAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantProxyTicketAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantServiceTicketAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/InitializeProxyAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/ValidateProxyCallbackAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/ValidateTicketAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/ticket/impl/SimpleTicketService.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/ticket/serialization/impl/AbstractTicketSerializer.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/ticket/serialization/impl/ProxyGrantingTicketSerializer.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/ticket/serialization/impl/ProxyTicketSerializer.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/ticket/serialization/impl/ServiceTicketSerializer.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/AbstractFlowActionTest.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/GrantServiceTicketActionTest.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/TestContextBuilder.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/ValidateProxyCallbackActionTest.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/ValidateTicketActionTest.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/impl/SimpleTicketServiceTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ProxyFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ProxyValidateFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/SamlValidateFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ServiceValidateFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ThrowingTicketService.java

Modified: trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java?rev=8076&r1=8075&r2=8076&view=diff
==============================================================================
--- trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java	(original)
+++ trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java	Fri Jan 15 07:27:32 2016
@@ -35,7 +35,8 @@
     private String parentId;
 
     /**
-     * Creates a proxy-granting ticket with the given values.
+     * Deprecated. Session IDs are now optional and should be specified via {@link TicketState#setSessionId(String)}
+     * and {@link #setTicketState(TicketState)}.
      *
      * @param id Ticket ID.
      * @param sessionId IdP session ID used to create ticket.
@@ -43,13 +44,31 @@
      * @param expiration Expiration instant.
      * @param parentId ID of parent proxy-granting ticket or null if this is first proxy in chain.
      */
+    @Deprecated
     public ProxyGrantingTicket(
             @Nonnull final String id,

[... 1645 lines stripped ...]