[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src: main/java/org/opensaml/saml/common/profile/impl/SignAssertio...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Mar  5 16:58:26 2014
New Revision: 3673

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3673&view=rev
Log:
Collapse signing actions into one action.

Added:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/SignAssertions.java   (with props)
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/SignAssertionsTest.java
      - copied, changed from r3669, trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/SignAssertionsTest.java
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/SignAssertions.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/SignAssertions.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/SignAssertionsTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java?rev=3673&r1=3672&r2=3673&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java Wed Mar  5 16:58:26 2014
@@ -55,6 +55,10 @@
  * <p>No assertions will be created by this action, but if no {@link Subject} exists in
  * the assertions found, it will be cretaed.</p>
  * 
+ * <p>An associated {@link SubjectConfirmationData} will be built to spec based on a set of
+ * lookup functions that optionally provide various attributes. They have appropriate defaults
+ * for the simple use case of a bearer SSO assertion but need to be overridden for other cases.</p>
+ * 
  * @event {@link EventIds#PROCEED_EVENT_ID}
  * @event {@link EventIds#INVALID_MSG_CTX}
  */

Copied: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/SignAssertionsTest.java (from r3669, trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/SignAssertionsTest.java)
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/SignAssertionsTest.java?p2=trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/SignAssertionsTest.java&p1=trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/SignAssertionsTest.java&r1=3669&r2=3673&rev=3673&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/SignAssertionsTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/SignAssertionsTest.java Wed Mar  5 16:58:26 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.opensaml.saml.saml2.profile.impl;
+package org.opensaml.saml.common.profile.impl;
 
 import java.security.KeyPair;
 
@@ -26,8 +26,7 @@
 import org.opensaml.profile.action.ActionTestingSupport;
 import org.opensaml.profile.action.EventIds;
 import org.opensaml.profile.context.ProfileRequestContext;
-import org.opensaml.saml.saml2.core.Assertion;
-import org.opensaml.saml.saml2.core.Response;
+import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
 import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
 import org.opensaml.security.credential.CredentialSupport;
 import org.opensaml.security.crypto.KeySupport;
@@ -41,7 +40,7 @@
 
     private SignAssertions action;
 
-    private ProfileRequestContext<Object,Response> prc;
+    private ProfileRequestContext prc;
 
     @BeforeMethod public void setUp() throws ComponentInitializationException {
 
@@ -62,6 +61,13 @@
 
     @Test public void testNoResponse() throws Exception {
         prc.getOutboundMessageContext().setMessage(null);
+        
+        action.execute(prc);
+        ActionTestingSupport.assertEvent(prc, EventIds.INVALID_MSG_CTX);
+    }
+
+    @Test public void testBadMessage() throws Exception {
+        prc.getOutboundMessageContext().setMessage(SAML1ActionTestingSupport.buildAttributeQueryRequest(null));
         
         action.execute(prc);
         ActionTestingSupport.assertEvent(prc, EventIds.INVALID_MSG_CTX);
@@ -88,9 +94,26 @@
         ActionTestingSupport.assertProceedEvent(prc);
     }
 
-    @Test public void testSignAssertions() throws Exception {
-        final Assertion assertion = SAML2ActionTestingSupport.buildAssertion();
-        prc.getOutboundMessageContext().getMessage().getAssertions().add(assertion);
+    @Test public void testSignSAML1Assertions() throws Exception {

[... 23 lines stripped ...]