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

[noreply at shibboleth.net]

Author: serac
Date: Mon Sep 19 10:30:08 2016
New Revision: 8403

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8403&view=rev
Log:
IDP-996 Fix ServiceNotSpecified error.

Initialize CAS request parrameters in context tree as soon as possible.
Stop validating IdPSession by default since it's not available on back
channel in client session storage mech. Add flag to allow session to be
optionally validated prior to granting proxy tickets, but not enabled
by default.

Added:
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/TicketPrincipalLookupFunction.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ToggleablePredicate.java
Modified:
    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/PrepareTicketValidationResponseAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/UpdateIdPSessionWithSPSessionAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/ValidateIdpSessionAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/ValidateTicketAction.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/ValidateIdpSessionActionTest.java
    trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
    trunk/idp-conf/src/main/resources/conf/cas-protocol.xml
    trunk/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/cas-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml
    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
    trunk/idp-conf/src/main/resources/system/flows/cas/proxyValidate/proxyValidate-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/validate-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/validate-abstract-flow.xml
    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/resources/test/test-cas-beans.xml

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantProxyTicketAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantProxyTicketAction.java?rev=8403&r1=8402&r2=8403&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantProxyTicketAction.java	(original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantProxyTicketAction.java	Mon Sep 19 10:30:08 2016
@@ -19,6 +19,8 @@
 
 import javax.annotation.Nonnull;
 
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
 import net.shibboleth.idp.cas.config.impl.ConfigLookupFunction;
 import net.shibboleth.idp.cas.config.impl.ProxyConfiguration;
 import net.shibboleth.idp.cas.protocol.ProtocolError;
@@ -27,7 +29,13 @@
 import net.shibboleth.idp.cas.ticket.ProxyGrantingTicket;
 import net.shibboleth.idp.cas.ticket.ProxyTicket;
 import net.shibboleth.idp.cas.ticket.TicketServiceEx;
+import net.shibboleth.idp.session.IdPSession;
+import net.shibboleth.idp.session.SessionException;
+import net.shibboleth.idp.session.SessionResolver;
+import net.shibboleth.idp.session.criterion.SessionIdCriterion;
 import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
+import net.shibboleth.utilities.java.support.resolver.ResolverException;
 import org.joda.time.DateTime;
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.slf4j.Logger;
@@ -40,6 +48,7 @@
  * <ul>
  *     <li><code>null</code> on success</li>
  *     <li>{@link ProtocolError#TicketCreationError TicketCreationError}</li>
+ *     <li>{@link ProtocolError#IllegalState IllegalState}</li>
  * </ul>
  *
  * @author Marvin S. Addison
@@ -56,7 +65,14 @@
 
     /** Manages CAS tickets. */
     @Nonnull
-    private final TicketServiceEx ticketService;
+    private final TicketServiceEx casTicketService;
+
+    /** Looks up IdP sessions. */
+    @Nonnull
+    private final SessionResolver sessionResolver;
+
+    /** Whether to resolve and validate IdP session as part of granting a proxy ticket. */
+    private Predicate<ProfileRequestContext> validateIdPSessionPredicate = Predicates.alwaysFalse();
 
 
     /**
@@ -64,8 +80,24 @@
      *
      * @param ticketService Ticket service component.
      */

[... 699 lines stripped ...]