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

[noreply at shibboleth.net]

Author: serac
Date: Fri Nov  7 09:32:00 2014
New Revision: 6861

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6861&view=rev
Log:
Add CAS proxy flow test.

Added:
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ProxyFlowTest.java
Modified:
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/service/Service.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/BuildRelyingPartyContextAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeProxyAction.java
    trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml

Modified: trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/service/Service.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/service/Service.java?rev=6861&r1=6860&r2=6861&view=diff
==============================================================================
--- trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/service/Service.java (original)
+++ trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/service/Service.java Fri Nov  7 09:32:00 2014
@@ -76,4 +76,9 @@
     public boolean isAuthorizedToProxy() {
         return authorizedToProxy;
     }
+
+    @Override
+    public String toString() {
+        return serviceURL;
+    }
 }

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/BuildRelyingPartyContextAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/BuildRelyingPartyContextAction.java?rev=6861&r1=6860&r2=6861&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/BuildRelyingPartyContextAction.java (original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/BuildRelyingPartyContextAction.java Fri Nov  7 09:32:00 2014
@@ -79,8 +79,11 @@
         final RelyingPartyContext rpc = new RelyingPartyContext();
         rpc.setVerified(service != null);
         rpc.setRelyingPartyId(serviceURL);
-        if (service == null) {
+        if (service != null) {
+            log.debug("Setting up RP context for verified relying party {}", service);
+        } else {
             service = new Service(serviceURL, UNVERIFIED_GROUP, false);
+            log.debug("Setting up RP context for unverified relying party {}", service);
         }
         profileRequestContext.addSubcontext(rpc);
         setCASService(profileRequestContext, service);

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeProxyAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeProxyAction.java?rev=6861&r1=6860&r2=6861&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeProxyAction.java (original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeProxyAction.java Fri Nov  7 09:32:00 2014
@@ -22,12 +22,11 @@
 import net.shibboleth.idp.cas.protocol.ProtocolParam;
 import net.shibboleth.idp.cas.protocol.ProxyTicketRequest;
 import net.shibboleth.idp.cas.protocol.ProxyTicketResponse;
+import net.shibboleth.idp.cas.ticket.ProxyGrantingTicket;
 import net.shibboleth.idp.cas.ticket.TicketContext;
 import net.shibboleth.idp.cas.ticket.TicketService;
-import net.shibboleth.idp.profile.AbstractProfileAction;
 import net.shibboleth.idp.profile.ActionSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,12 +41,16 @@
  * <ul>
  *     <li>{@link Events#Proceed proceed}</li>
  *     <li>{@link ProtocolError#ServiceNotSpecified serviceNotSpecified}</li>
+ *     <li>{@link ProtocolError#TicketExpired ticketExpired}</li>
  *     <li>{@link ProtocolError#TicketNotSpecified ticketNotSpecified}</li>
  *     <li>{@link ProtocolError#TicketRetrievalError ticketRetrievalError}</li>
  * </ul>
  * <p>
- * Creates a {@link TicketContext} containing the PGT provided to the <code>/proxy</code> endpoint and places it under
- * the {@link ProfileRequestContext}.
+ * Creates the following contexts on success:
+ * <ul>
+ *     <li><code>ProfileRequestContext</code> -&gt; {@link net.shibboleth.idp.cas.protocol.ProtocolContext}</li>
+ *     <li><code>ProfileRequestContext</code> -&gt; <code>ProtocolContext</code> -&gt; {@link TicketContext}</li>
+ * </ul>
  *
  * @author Marvin S. Addison
  */
@@ -57,10 +60,11 @@
     private final Logger log = LoggerFactory.getLogger(InitializeProxyAction.class);
 
     /** Manages CAS tickets. */
-    @Nonnull private TicketService ticketService;
+    @Nonnull
+    private final TicketService ticketService;
 
 

[... 91 lines stripped ...]