[java-identity-provider COMMIT] in /trunk/idp-profile-spring: pom.xml src/main/java/net/shibboleth/idp/profile/spring...

[noreply at shibboleth.net]

Author: rdw
Date: Sun Feb 22 10:03:04 2015
New Revision: 7362

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7362&view=rev
Log:
IDP 610 Add Chaining Trust Engine and tests

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/ChainingParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/ChainingTrustEngineFactory.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/ChainingTrustEngineTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/MockTrustEngine.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/chainingTrue.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/chainingTrueFalse.xml
Modified:
    trunk/idp-profile-spring/pom.xml
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/UnsupportedTrustEngineParser.java

Modified: trunk/idp-profile-spring/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/pom.xml?rev=7362&r1=7361&r2=7362&view=diff
==============================================================================
--- trunk/idp-profile-spring/pom.xml (original)
+++ trunk/idp-profile-spring/pom.xml Sun Feb 22 10:03:04 2015
@@ -64,6 +64,18 @@
         </dependency>
         
         <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-security-api</artifactId>
+            <version>${opensaml.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-security-impl</artifactId>
+            <version>${opensaml.version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.tmatesoft.svnkit</groupId>
             <artifactId>svnkit</artifactId>
             <!-- Required for SVNResource. Constrained by licensing. -->

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java?rev=7362&r1=7361&r2=7362&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java Sun Feb 22 10:03:04 2015
@@ -25,6 +25,7 @@
 import net.shibboleth.idp.profile.spring.relyingparty.security.credential.X509InlineCredentialParser;
 import net.shibboleth.idp.profile.spring.relyingparty.security.credential.X509ResourceCredentialParser;
 import net.shibboleth.idp.profile.spring.relyingparty.security.trustengine.CertPathPKIXValidationOptionsParser;
+import net.shibboleth.idp.profile.spring.relyingparty.security.trustengine.ChainingParser;
 import net.shibboleth.idp.profile.spring.relyingparty.security.trustengine.PKIXInlineValidationInfoParser;
 import net.shibboleth.idp.profile.spring.relyingparty.security.trustengine.PKIXResourceValidationInfoParser;
 import net.shibboleth.idp.profile.spring.relyingparty.security.trustengine.PKIXValidationOptionsParser;
@@ -47,6 +48,9 @@
 
     /** SecurityPolicy element name. */
     public static final QName SECURITY_POLICY_NAME = new QName(NAMESPACE, "SecurityPolicy");
+
+    /** TrustEngineRef element name. */
+    public static final QName TRUST_ENGINE_REF= new QName(NAMESPACE, "TrustEngineRef");
 
     /** {@inheritDoc} */
     @Override public void init() {
@@ -87,11 +91,16 @@
         registerBeanDefinitionParser(PKIXValidationOptionsParser.ELEMENT_NAME, new PKIXValidationOptionsParser());
         registerBeanDefinitionParser(CertPathPKIXValidationOptionsParser.ELEMENT_NAME,
                 new CertPathPKIXValidationOptionsParser());
+        
+        //
+        // Trust Engines needed for the HttpMetadataProvider
+        //
+        registerBeanDefinitionParser(ChainingParser.TYPE_NAME, new ChainingParser());
 
         // Credential unsupported
-        registerBeanDefinitionParser(UnsupportedTrustEngineParser.CHAINING_TYPE, new UnsupportedTrustEngineParser());
         registerBeanDefinitionParser(UnsupportedTrustEngineParser.PKIX_CREDENTIAL, new UnsupportedTrustEngineParser());
-        registerBeanDefinitionParser(UnsupportedTrustEngineParser.STATIC_EXPLICIT_KEY_TYPE, new UnsupportedTrustEngineParser());

[... 31 lines stripped ...]