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

[noreply at shibboleth.net]

Author: serac
Date: Tue Nov  4 16:22:09 2014
New Revision: 6834

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6834&view=rev
Log:
Add CAS protocol flow config files.

Added:
    trunk/idp-conf/src/main/resources/conf/cas-protocol.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/
    trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/
    trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/login/
    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/
    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/
    trunk/idp-conf/src/main/resources/system/flows/cas/proxyValidate/proxyValidate-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/proxyValidate/proxyValidate-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/samlValidate/
    trunk/idp-conf/src/main/resources/system/flows/cas/samlValidate/samlValidate-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/samlValidate/samlValidate-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/serviceValidate/
    trunk/idp-conf/src/main/resources/system/flows/cas/serviceValidate/serviceValidate-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/serviceValidate/serviceValidate-flow.xml
    trunk/idp-conf/src/main/resources/system/views/
    trunk/idp-conf/src/main/resources/system/views/cas/
    trunk/idp-conf/src/main/resources/system/views/cas/footer.vm
    trunk/idp-conf/src/main/resources/system/views/cas/header.vm
    trunk/idp-conf/src/main/resources/system/views/cas/proxyFailure.vm
    trunk/idp-conf/src/main/resources/system/views/cas/proxySuccess.vm
    trunk/idp-conf/src/main/resources/system/views/cas/serviceValidateFailure.vm
    trunk/idp-conf/src/main/resources/system/views/cas/serviceValidateSuccess.vm
Modified:
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/ExtractAttributesAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeLoginAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeProxyAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeValidateAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/ProcessSamlMessageAction.java
    trunk/idp-conf/pom.xml
    trunk/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/ExtractAttributesAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/ExtractAttributesAction.java?rev=6834&r1=6833&r2=6834&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/ExtractAttributesAction.java (original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/ExtractAttributesAction.java Tue Nov  4 16:22:09 2014
@@ -22,12 +22,14 @@
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.IdPAttributeValue;
 import net.shibboleth.idp.attribute.context.AttributeContext;
+import net.shibboleth.idp.authn.context.SubjectContext;
 import net.shibboleth.idp.cas.protocol.ProtocolError;
 import net.shibboleth.idp.cas.protocol.TicketValidationRequest;
 import net.shibboleth.idp.cas.protocol.TicketValidationResponse;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
 import org.opensaml.messaging.context.navigate.ChildContextLookup;
 import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.saml.saml1.core.Subject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.webflow.execution.Event;
@@ -66,7 +68,14 @@
             return ProtocolError.IllegalState.event(this);
         }
 
+        final SubjectContext sc = profileRequestContext.getSubcontext(SubjectContext.class, false);
+        if (sc == null) {
+            log.info("SubjectContext not found in profile request context.");
+            return ProtocolError.IllegalState.event(this);
+        }
+
         final TicketValidationResponse response = getCASResponse(profileRequestContext);
+        response.setUserName(sc.getPrincipalName());
         for (IdPAttribute attribute : ac.getIdPAttributes().values()) {
             log.debug("Processing {}", attribute);
             for (IdPAttributeValue<?> value : attribute.getValues()) {


[... 196 lines stripped ...]