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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Jun 21 06:18:56 2014
New Revision: 6137

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6137&view=rev
Log:
IDP-390 Final prep for Alpha
- Add ChainingSignatureParser, this needs to deal with unsupported types  (per below) and so needs a factory bean
- PKIX static parser issues a warning
- All other trust engine types issue a warning and create an ungarnished object.

- The V2 example relying party is now present in a test in its entirety and will parse without error - just a bunch of warning messages.

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/ChainingSignatureTrustEngineFactory.java   (with props)
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/SignatureChainingParser.java   (with props)
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/SignatureChainingParserTest.java   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/chain.xml   (with props)
Modified:
    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/StaticExplicitKeySignatureParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/StaticPKIXSignatureParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/UnsupportedTrustEngineParser.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group.xml

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=6137&r1=6136&r2=6137&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 Sat Jun 21 06:18:56 2014
@@ -25,7 +25,9 @@
 import net.shibboleth.idp.profile.spring.relyingparty.security.credential.ResourceCredentialParser;
 import net.shibboleth.idp.profile.spring.relyingparty.security.credential.X509FilesystemCredentialParser;
 import net.shibboleth.idp.profile.spring.relyingparty.security.credential.X509InlineCredentialParser;
+import net.shibboleth.idp.profile.spring.relyingparty.security.trustengine.SignatureChainingParser;
 import net.shibboleth.idp.profile.spring.relyingparty.security.trustengine.StaticExplicitKeySignatureParser;
+import net.shibboleth.idp.profile.spring.relyingparty.security.trustengine.StaticPKIXSignatureParser;
 import net.shibboleth.idp.profile.spring.relyingparty.security.trustengine.UnsupportedTrustEngineParser;
 
 /** Namespace handler <em>{@value NAMESPACE}</em>. */
@@ -55,7 +57,10 @@
 
         registerBeanDefinitionParser(StaticExplicitKeySignatureParser.SCHEMA_TYPE,
                 new StaticExplicitKeySignatureParser());
+        registerBeanDefinitionParser(StaticPKIXSignatureParser.SCHEMA_TYPE, new StaticPKIXSignatureParser());
+        registerBeanDefinitionParser(SignatureChainingParser.SCHEMA_TYPE, new SignatureChainingParser());
 
+        // Metadata based unsupported
         registerBeanDefinitionParser(UnsupportedTrustEngineParser.METADATA_EXPLICIT_KEY,
                 new UnsupportedTrustEngineParser());
         registerBeanDefinitionParser(UnsupportedTrustEngineParser.METADATA_EXPLICIT_KEY_SIGNATURE,
@@ -65,5 +70,8 @@
         registerBeanDefinitionParser(UnsupportedTrustEngineParser.METADATA_PKIX_SIGNATURE,
                 new UnsupportedTrustEngineParser());
 
+        // Credential unsupported
+        registerBeanDefinitionParser(UnsupportedTrustEngineParser.CHAINING, new UnsupportedTrustEngineParser());
+        registerBeanDefinitionParser(UnsupportedTrustEngineParser.PKIX_CREDENTIAL, new UnsupportedTrustEngineParser());
     }
 }

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/StaticExplicitKeySignatureParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/StaticExplicitKeySignatureParser.java?rev=6137&r1=6136&r2=6137&view=diff
==============================================================================

[... 220 lines stripped ...]