[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: Wed Aug 24 07:56:53 2016
New Revision: 8347

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8347&view=rev
Log:
IDP-1018 Encode proxy ticket data into ticket ID.
https://issues.shibboleth.net/jira/browse/IDP-1018

Handle proxy tickets similarly to service tickets and document limitations
on one-time use.

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-impl/src/main/java/net/shibboleth/idp/cas/ticket/impl/AbstractTicketService.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/ticket/impl/EncodingTicketService.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/ticket/impl/SimpleTicketService.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/impl/EncodingTicketServiceTest.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=8347&r1=8346&r2=8347&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	Wed Aug 24 07:56:53 2016
@@ -85,4 +85,9 @@
     public boolean isRoot() {
         return getParentId() == null;
     }
+
+    @Override
+    protected Ticket newInstance(final String newId) {
+        return new ProxyGrantingTicket(newId, getService(), getExpirationInstant(), parentId);
+    }
 }

Modified: trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java?rev=8347&r1=8346&r2=8347&view=diff
==============================================================================
--- trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java	(original)
+++ trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java	Wed Aug 24 07:56:53 2016
@@ -76,4 +76,9 @@
     public String getPgtId() {
         return pgtId;
     }
+
+    @Override
+    protected Ticket newInstance(final String newId) {
+        return new ProxyTicket(newId, getService(), getExpirationInstant(), pgtId);
+    }
 }

Modified: trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ServiceTicket.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ServiceTicket.java?rev=8347&r1=8346&r2=8347&view=diff
==============================================================================
--- trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ServiceTicket.java	(original)
+++ trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ServiceTicket.java	Wed Aug 24 07:56:53 2016
@@ -73,4 +73,9 @@
     public boolean isRenew() {
         return renew;
     }
+
+    @Override
+    protected Ticket newInstance(final String newId) {
+        return new ServiceTicket(newId, getService(), getExpirationInstant(), renew);
+    }
 }

Modified: trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/Ticket.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/Ticket.java?rev=8347&r1=8346&r2=8347&view=diff
==============================================================================
--- trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/Ticket.java	(original)
+++ trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/Ticket.java	Wed Aug 24 07:56:53 2016
@@ -133,4 +133,22 @@
     public String toString() {
         return id;
     }
+
+    /**
+     * Creates a new ticket from this one with the given identifier.
+     *
+     * @param newId New ticket ID.
+     *
+     * @return Clone of this ticket with new ID.
+     */
+    public Ticket clone(final String newId) {
+        final Ticket clone = newInstance(newId);
+        clone.setTicketState(ticketState);
+        return clone;
+    }
+
+    protected Ticket newInstance(final String newId) {
+        return new Ticket(newId, service, expirationInstant);
+    }
+
 }

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/ticket/impl/AbstractTicketService.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/ticket/impl/AbstractTicketService.java?rev=8347&r1=8346&r2=8347&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/ticket/impl/AbstractTicketService.java	(original)

[... 389 lines stripped ...]