[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml idp-...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb 24 14:28:21 2014
New Revision: 5462

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5462&view=rev
Log:
IDP-146 - clean up action, and move down into OpenSAML along with ancillary support class

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/saml1/SAML1ActionSupport.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAttributeStatementToAssertion.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAudienceRestrictionToAssertions.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAuthenticationStatementToAssertion.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddDoNotCacheConditionToAssertions.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddNotBeforeConditionToAssertions.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddNotOnOrAfterConditionToAssertions.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddNotBeforeConditionToAssertionsTest.java

Modified: trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml?rev=5462&r1=5461&r2=5462&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml Mon Feb 24 14:28:21 2014
@@ -253,7 +253,7 @@
 
     <bean
         id="AddNotBeforeConditionToAssertions"
-        class="net.shibboleth.idp.saml.impl.profile.saml1.AddNotBeforeConditionToAssertions"
+        class="org.opensaml.saml.saml1.profile.impl.AddNotBeforeConditionToAssertions"
         scope="prototype" />
 
     <bean

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAttributeStatementToAssertion.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAttributeStatementToAssertion.java?rev=5462&r1=5461&r2=5462&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAttributeStatementToAssertion.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAttributeStatementToAssertion.java Mon Feb 24 14:28:21 2014
@@ -22,6 +22,7 @@
 import java.util.Set;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import net.shibboleth.ext.spring.webflow.Event;
 import net.shibboleth.ext.spring.webflow.Events;
@@ -39,7 +40,6 @@
 
 import net.shibboleth.idp.saml.attribute.encoding.AbstractSAML1AttributeEncoder;
 import net.shibboleth.idp.saml.profile.SAMLEventIds;
-import net.shibboleth.idp.saml.profile.saml1.SAML1ActionSupport;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
@@ -51,6 +51,7 @@
 import org.opensaml.saml.saml1.core.Attribute;
 import org.opensaml.saml.saml1.core.AttributeStatement;
 import org.opensaml.saml.saml1.core.Response;
+import org.opensaml.saml.saml1.profile.SAML1ActionSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.webflow.execution.RequestContext;
@@ -92,10 +93,11 @@
      */
     private Function<ProfileRequestContext, RelyingPartyContext> relyingPartyContextLookupStrategy;
 
+    /** RelyingPartyContext to use. */
+    @Nullable private RelyingPartyContext relyingPartyCtx;
+    
     /** Constructor. */
     public AddAttributeStatementToAssertion() {
-        super();
-
         statementInOwnAssertion = false;
 
         relyingPartyContextLookupStrategy =
@@ -181,7 +183,7 @@
             @Nonnull final ProfileRequestContext<Object, Response> profileRequestContext) throws ProfileException {
         log.debug("Action {}: Attempting to add an AttributeStatement to outgoing Response", getId());
 
-        final RelyingPartyContext relyingPartyCtx = relyingPartyContextLookupStrategy.apply(profileRequestContext);
+        relyingPartyCtx = relyingPartyContextLookupStrategy.apply(profileRequestContext);
         if (relyingPartyCtx == null) {
             log.error("Action {}: No relying party context located in current profile request context", getId());
             return ActionSupport.buildEvent(this, IdPEventIds.INVALID_RELYING_PARTY_CTX);
@@ -226,14 +228,13 @@
      * @return the assertion to which the attribute statement will be added
      */
     private Assertion getStatementAssertion(RelyingPartyContext relyingPartyContext, Response response) {
-        final Assertion assertion;

[... 121 lines stripped ...]