[java-idp-testbed COMMIT] in /trunk/src/test: java/idp/c14n/TestC14N.java java/idp/c14n/actions/SetupForC14N.java res...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Feb 20 13:48:00 2014
New Revision: 152

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=152&view=rev
Log:
IDP-359  Crypto Transient NameID C14N flow and test

Added:
    trunk/src/test/resources/c14n/webflows/beans.xml
      - copied, changed from r150, trunk/src/test/resources/c14n/webflows/transientNameID-beans.xml
    trunk/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml   (with props)
Modified:
    trunk/src/test/java/idp/c14n/TestC14N.java
    trunk/src/test/java/idp/c14n/actions/SetupForC14N.java
    trunk/src/test/resources/c14n/attribute-resolver.xml
    trunk/src/test/resources/c14n/test-webflow-config.xml
    trunk/src/test/resources/c14n/webflows/transientNameID-beans.xml
    trunk/src/test/resources/c14n/webflows/transientNameID-flow.xml

Modified: trunk/src/test/java/idp/c14n/TestC14N.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/c14n/TestC14N.java?rev=152&r1=151&r2=152&view=diff
==============================================================================
--- trunk/src/test/java/idp/c14n/TestC14N.java (original)
+++ trunk/src/test/java/idp/c14n/TestC14N.java Thu Feb 20 13:48:00 2014
@@ -56,4 +56,16 @@
 
     }
     
+    @Test public void testCryptoTransientNameID() {
+
+        FlowExecutionResult result = flowExecutor.launchExecution("cryptoTransientNameID", null, externalContext);
+        Assert.assertEquals("cryptoTransientNameID", result.getFlowId());
+
+        FlowExecutionOutcome outcome = result.getOutcome();
+        log.debug("flow outcome {}", outcome);
+        Assert.assertNotNull(outcome);
+        Assert.assertEquals(outcome.getId(), "end");
+        Assert.assertTrue(result.isEnded());
+
+    }
 }

Modified: trunk/src/test/java/idp/c14n/actions/SetupForC14N.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/c14n/actions/SetupForC14N.java?rev=152&r1=151&r2=152&view=diff
==============================================================================
--- trunk/src/test/java/idp/c14n/actions/SetupForC14N.java (original)
+++ trunk/src/test/java/idp/c14n/actions/SetupForC14N.java Thu Feb 20 13:48:00 2014
@@ -36,28 +36,42 @@
  */
 public class SetupForC14N extends AbstractProfileAction {
     
-    @Override
-    protected void doExecute(
-            @Nonnull final ProfileRequestContext profileRequestContext)
+    private String attributeName;
+
+    /**
+     * @return Returns the attributeName.
+     */
+    public String getAttributeName() {
+        return attributeName;
+    }
+
+    /**
+     * @param attributeName The attributeName to set.
+     */
+    public void setAttributeName(String attributeName) {
+        this.attributeName = attributeName;
+    }
+
+    @Override protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext)
             throws ProfileException {
-        
+
         RelyingPartyContext rpc = profileRequestContext.getSubcontext(RelyingPartyContext.class, false);
-        
+
         AttributeContext ac = rpc.getSubcontext(AttributeContext.class, false);
-        
+
         NameID nid = (new NameIDBuilder().buildObject());
-        nid.setValue((String) ac.getIdPAttributes().get("transientId").getValues().iterator().next().getValue());
+        nid.setValue((String) ac.getIdPAttributes().get(getAttributeName()).getValues().iterator().next().getValue());
         nid.setFormat("urn:oasis:names:tc:SAML:2.0:nameid-format:transient");
-        
+
         NameIDPrincipal nidp = new NameIDPrincipal(nid);
         Subject sub = new Subject();
         sub.getPrincipals().add(nidp);
-        
-        SubjectCanonicalizationContext scc = profileRequestContext.getSubcontext(SubjectCanonicalizationContext.class, true);
+
+        SubjectCanonicalizationContext scc =
+                profileRequestContext.getSubcontext(SubjectCanonicalizationContext.class, true);
         scc.setSubject(sub);
         scc.setRequesterId(rpc.getRelyingPartyId());
         scc.setResponderId(rpc.getConfiguration().getResponderId());
-        
+
     }
-    
 }

Modified: trunk/src/test/resources/c14n/attribute-resolver.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/resources/c14n/attribute-resolver.xml?rev=152&r1=151&r2=152&view=diff
==============================================================================
--- trunk/src/test/resources/c14n/attribute-resolver.xml (original)
+++ trunk/src/test/resources/c14n/attribute-resolver.xml Thu Feb 20 13:48:00 2014
@@ -16,5 +16,10 @@
         <resolver:AttributeEncoder xsi:type="enc:SAML1StringNameIdentifier" nameFormat="urn:mace:shibboleth:1.0:nameIdentifier"/>
         <resolver:AttributeEncoder xsi:type="enc:SAML2StringNameID" nameFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:transient"/>
     </resolver:AttributeDefinition>
+    
+    <resolver:AttributeDefinition id="cryptoTransientId" xsi:type="ad:CryptoTransientId" dataSealerRef="shibboleth.DataSealer">

[... 59 lines stripped ...]