[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-spring/src: main/java/net/shibboleth/idp/attribute/r...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Feb 22 05:15:51 2014
New Revision: 5442

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5442&view=rev
Log:
IDP-267 CryptoTransient PrincipalConnector

Added:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/CryptoTransientConnectorParser.java   (with props)
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/CryptoTransientTest.java   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/crypto.xml   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/PrincipalConnectorNamespaceHandler.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/TransientTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/direct.xml

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/PrincipalConnectorNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/PrincipalConnectorNamespaceHandler.java?rev=5442&r1=5441&r2=5442&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/PrincipalConnectorNamespaceHandler.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/PrincipalConnectorNamespaceHandler.java Sat Feb 22 05:15:51 2014
@@ -33,5 +33,7 @@
         registerBeanDefinitionParser(DirectConnectorParser.ELEMENT_NAME, new DirectConnectorParser());
 
         registerBeanDefinitionParser(TransientConnectorParser.ELEMENT_NAME, new TransientConnectorParser());
+
+        registerBeanDefinitionParser(CryptoTransientConnectorParser.ELEMENT_NAME, new CryptoTransientConnectorParser());
     }
 }

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java?rev=5442&r1=5441&r2=5442&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java Sat Feb 22 05:15:51 2014
@@ -18,10 +18,14 @@
 package net.shibboleth.idp.attribute.resolver.spring.pc;
 
 import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
+import net.shibboleth.idp.authn.SubjectCanonicalizationException;
 import net.shibboleth.idp.saml.impl.attribute.principalconnector.PrincipalConnector;
 import net.shibboleth.idp.saml.impl.nameid.DirectNameIDDecoder;
 import net.shibboleth.idp.saml.impl.nameid.DirectNameIdentifierDecoder;
+import net.shibboleth.idp.saml.nameid.NameDecoderException;
 
+import org.opensaml.saml.saml2.core.NameID;
+import org.opensaml.saml.saml2.core.impl.NameIDBuilder;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -30,13 +34,19 @@
  */
 public class DirectTest extends BaseAttributeDefinitionParserTest {
 
-    @Test public void simple() {
+    @Test public void simple() throws SubjectCanonicalizationException, NameDecoderException {
         PrincipalConnector connector = getPrincipalConnector("direct.xml");
         
         Assert.assertTrue(connector.getNameIDDecoder() instanceof DirectNameIDDecoder);
         Assert.assertTrue(connector.getNameIdentifierDecoder() instanceof DirectNameIdentifierDecoder);
-        Assert.assertEquals(connector.getFormat(), "urn:mace:shibboleth:1.0:nameIdentifier");
+        Assert.assertEquals(connector.getFormat(), "https://example.org/direct");
         Assert.assertTrue(connector.getRelyingParties().isEmpty());
+        
+        NameID id = new NameIDBuilder().buildObject();
+        id.setFormat("https://example.org/sealer");
+        id.setValue("The_value");
+        
+        Assert.assertEquals(connector.decode(id, "", ""), "The_value");
     }
     
     @Test public void relyingParties() {

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/TransientTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/TransientTest.java?rev=5442&r1=5441&r2=5442&view=diff

[... 25 lines stripped ...]