[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Jan 29 10:54:23 2014
New Revision: 5268

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5268&view=rev
Log:
IDP-359 CryptoTransientDecoder and tests

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientDecoder.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientDecoderTest.java   (with props)
    trunk/idp-saml-impl/src/test/resources/SealerKeyStore.jks   (with props)
Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinitionTest.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameIdentifierAttributeDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/TransientDecoder.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/TransientDecoderTest.java

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinitionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinitionTest.java?rev=5268&r1=5267&r2=5268&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinitionTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinitionTest.java Wed Jan 29 10:54:23 2014
@@ -17,12 +17,11 @@
 
 package net.shibboleth.idp.attribute.resolver.impl.ad;
 
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.util.Collections;
 import java.util.Set;
+
+import javax.security.auth.Subject;
 
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.IdPAttributeValue;
@@ -31,10 +30,22 @@
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
 import net.shibboleth.idp.attribute.resolver.impl.TestSources;
+import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
+import net.shibboleth.idp.saml.authn.principal.NameIDPrincipal;
+import net.shibboleth.idp.saml.impl.nameid.CryptoTransientDecoder;
+import net.shibboleth.idp.saml.impl.nameid.NameIDCanonicalization;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.security.DataSealer;
 import net.shibboleth.utilities.java.support.security.DataSealerException;
 
+import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.profile.ProfileException;
+import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.saml.saml2.core.NameID;
+import org.opensaml.saml.saml2.core.impl.NameIDBuilder;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -43,7 +54,7 @@
  * Tests for {Link CryptoTransientIdAttributeDefinition}.
  */
 
-public class CryptoTransientIdAttributeDefinitionTest {
+public class CryptoTransientIdAttributeDefinitionTest   extends OpenSAMLInitBaseTestCase {
 
     private static final String ID = "CryptoTransientIdAttributeDefn";
 
@@ -52,26 +63,18 @@
     private DataSealer dataSealer;
 
     /**
-     * Copy the JKS from the classpath into the filesystem and get the name.
+     * Set up the data sealer.  We take advantage of the fact that Spring a {@link ClassPathResource} wraps a files.
      * 
      * @throws IOException
      * @throws DataSealerException
      * @throws ComponentInitializationException 
      */
-    @BeforeClass public void setupDataSealser() throws IOException, DataSealerException, ComponentInitializationException {
-        final File out = File.createTempFile("testDataSeal", "file");
-
-        final InputStream inStream = CryptoTransientIdAttributeDefinitionTest.class.getResourceAsStream("/data/SealerKeyStore.jks");
-
-        final String keyStorePath = out.getAbsolutePath();
-
-        final OutputStream outStream = new FileOutputStream(out, false);
-
-        final byte buffer[] = new byte[1024];
-
-        final int bytesRead = inStream.read(buffer);
-        outStream.write(buffer, 0, bytesRead);
-        outStream.close();
+    @BeforeClass public void setupDataSealer() throws IOException, DataSealerException, ComponentInitializationException {
+        
+        final Resource keyStore  = new ClassPathResource("/data/SealerKeyStore.jks");

[... 485 lines stripped ...]