[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: Wed Jul  2 09:24:47 2014
New Revision: 6205

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6205&view=rev
Log:
PKIXResourceBacked is an unsupported (V2 &V3) source of PKIX Validation Information.  Check in a failing parser and annotate the schema appropriately.

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/PKIXResourceBackedValidationInfoParser.java   (with props)
Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java
    trunk/idp-schema/src/main/resources/schema/shibboleth-security.xsd

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=6205&r1=6204&r2=6205&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 Wed Jul  2 09:24:47 2014
@@ -25,6 +25,7 @@
 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.PKIXResourceBackedValidationInfoParser;
 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;
@@ -52,10 +53,6 @@
         registerBeanDefinitionParser(BasicInlineCredentialParser.ELEMENT_NAME, new BasicInlineCredentialParser());
         registerBeanDefinitionParser(BasicFilesystemCredentialParser.ELEMENT_NAME,
                 new BasicFilesystemCredentialParser());
-        registerBeanDefinitionParser(ResourceCredentialParser.X509_RESOURCE_ELEMENT_NAME,
-                new ResourceCredentialParser());
-        registerBeanDefinitionParser(ResourceCredentialParser.BASIC_RESOURCE_ELEMENT_NAME,
-                new ResourceCredentialParser());
 
         registerBeanDefinitionParser(StaticExplicitKeySignatureParser.ELEMENT_NAME,
                 new StaticExplicitKeySignatureParser());
@@ -75,5 +72,14 @@
         // Credential unsupported
         registerBeanDefinitionParser(UnsupportedTrustEngineParser.CHAINING, new UnsupportedTrustEngineParser());
         registerBeanDefinitionParser(UnsupportedTrustEngineParser.PKIX_CREDENTIAL, new UnsupportedTrustEngineParser());
+
+        // Resource backed anything
+        registerBeanDefinitionParser(ResourceCredentialParser.X509_RESOURCE_ELEMENT_NAME,
+                new ResourceCredentialParser());
+        registerBeanDefinitionParser(ResourceCredentialParser.BASIC_RESOURCE_ELEMENT_NAME,
+                new ResourceCredentialParser());
+        registerBeanDefinitionParser(PKIXResourceBackedValidationInfoParser.ELEMENT_NAME,
+                new PKIXResourceBackedValidationInfoParser());
+        
     }
 }

Modified: trunk/idp-schema/src/main/resources/schema/shibboleth-security.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-schema/src/main/resources/schema/shibboleth-security.xsd?rev=6205&r1=6204&r2=6205&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-security.xsd (original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-security.xsd Wed Jul  2 09:24:47 2014
@@ -226,10 +226,7 @@
     
     <complexType name="PKIXResourceBacked">
         <annotation>
-            <documentation>
-                Allows PKIX validation info components read from configured resources.
-                Certificates, and CRLs may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
-            </documentation>
+            <documentation>This credential type is not supported by the Shibboleth IdP</documentation>
         </annotation>
         <complexContent>
             <extension base="sec:PKIXValidationInfoType"/>