[java-identity-provider COMMIT] in /trunk/idp-cas-impl/src: main/java/net/shibboleth/idp/cas/config/ProxyTicketConfig...

[noreply at shibboleth.net]

Author: serac
Date: Mon Nov  3 10:34:30 2014
New Revision: 6828

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6828&view=rev
Log:
Improve CAS proxy flow action test coverage.

Added:
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/GrantProxyTicketActionTest.java
Modified:
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/ProxyTicketConfiguration.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/ServiceTicketConfiguration.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/GrantProxyTicketAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/ticket/SimpleTicketService.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/GrantServiceTicketActionTest.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/ValidateProxyCallbackActionTest.java
    trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/ProxyTicketConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/ProxyTicketConfiguration.java?rev=6828&r1=6827&r2=6828&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/ProxyTicketConfiguration.java (original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/ProxyTicketConfiguration.java Mon Nov  3 10:34:30 2014
@@ -39,6 +39,8 @@
     /** Creates a new instance. */
     public ProxyTicketConfiguration() {
         super(PROFILE_ID);
+        // Proxy tickets valid for 15s by default
+        setTicketValidityPeriod(15000);
     }
 
     @Override

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/ServiceTicketConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/ServiceTicketConfiguration.java?rev=6828&r1=6827&r2=6828&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/ServiceTicketConfiguration.java (original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/ServiceTicketConfiguration.java Mon Nov  3 10:34:30 2014
@@ -69,6 +69,8 @@
     /** Creates a new instance. */
     public ServiceTicketConfiguration() {
         super(PROFILE_ID);
+        // Service tickets valid for 15s by default
+        setTicketValidityPeriod(15000);
     }
 
     /** {@inheritDoc} */

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/GrantProxyTicketAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/GrantProxyTicketAction.java?rev=6828&r1=6827&r2=6828&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/GrantProxyTicketAction.java (original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/GrantProxyTicketAction.java Mon Nov  3 10:34:30 2014
@@ -60,11 +60,16 @@
 
     /** Manages CAS tickets. */
     @Nonnull
-    private TicketService ticketService;
+    private final TicketService ticketService;
 
 
-    public void setTicketService(@Nonnull final TicketService ticketService) {
-        this.ticketService = Constraint.isNotNull(ticketService, "Ticket service cannot be null.");
+    /**
+     * Creates a new instance.
+     *
+     * @param ticketService Ticket service component.
+     */
+    public GrantProxyTicketAction(final TicketService ticketService) {
+        this.ticketService = Constraint.isNotNull(ticketService, "TicketService cannot be null");
     }
 
     /** {@inheritDoc} */
@@ -75,6 +80,10 @@
             final @Nonnull ProfileRequestContext<ProxyTicketRequest, ProxyTicketResponse> profileRequestContext) {
 
         final ProxyTicketRequest request = FlowStateSupport.getProxyTicketRequest(springRequestContext);
+        if (request == null) {
+            log.info("ProxyTicketRequest not found in flow state.");
+            return ProtocolError.IllegalState.event(this);
+        }
         final TicketContext ticketContext = profileRequestContext.getSubcontext(TicketContext.class);
         if (ticketContext == null) {
             log.info("TicketContext not found in profile request context.");

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

[... 102 lines stripped ...]