[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: Thu Apr 24 12:59:47 2014
New Revision: 5769

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5769&view=rev
Log:
IDP-390 Add failure if we encounter unsupported Resource backed credentials

V2 just didn't declare the parsers.  In V3 we will provide better errors.

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/ResourceCredentialParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/ResourceParserTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceBasic.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceX509.xml
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=5769&r1=5768&r2=5769&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 Thu Apr 24 12:59:47 2014
@@ -19,6 +19,7 @@
 
 import net.shibboleth.idp.profile.spring.relyingparty.security.credential.BasicFilesystemCredentialParser;
 import net.shibboleth.idp.profile.spring.relyingparty.security.credential.BasicInlineCredentialParser;
+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.StaticExplicitKeySignatureParser;
@@ -35,7 +36,10 @@
         registerBeanDefinitionParser(X509FilesystemCredentialParser.SCHEMA_TYPE, new X509FilesystemCredentialParser());
         registerBeanDefinitionParser(X509InlineCredentialParser.SCHEMA_TYPE, new X509InlineCredentialParser());
         registerBeanDefinitionParser(BasicInlineCredentialParser.SCHEMA_TYPE, new BasicInlineCredentialParser());
-        registerBeanDefinitionParser(BasicFilesystemCredentialParser.SCHEMA_TYPE, new BasicFilesystemCredentialParser());
+        registerBeanDefinitionParser(BasicFilesystemCredentialParser.SCHEMA_TYPE,
+                new BasicFilesystemCredentialParser());
+        registerBeanDefinitionParser(ResourceCredentialParser.X509_RESOURCE_TYPE, new ResourceCredentialParser());
+        registerBeanDefinitionParser(ResourceCredentialParser.BASIC_RESOURCE_TYPE, new ResourceCredentialParser());
 
         registerBeanDefinitionParser(StaticExplicitKeySignatureParser.SCHEMA_TYPE,
                 new StaticExplicitKeySignatureParser());

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=5769&r1=5768&r2=5769&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-security.xsd (original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-security.xsd Thu Apr 24 12:59:47 2014
@@ -21,8 +21,6 @@
             <documentation>
                 Allows credential components to be specified by filesystem path. Keys, Certificates, and CRLs may be
                 PKCS#12, DER, or PEM encoded and may be encrypted or not.
-                
-                This method is deprecated in favor of the X509ResourceBacked type employing a filesystem resource.
             </documentation>
         </annotation>
         <complexContent>
@@ -32,10 +30,7 @@
     
     <complexType name="X509ResourceBacked">
         <annotation>
-            <documentation>
-                Allows credential components to be retrieved via a resource. Keys, 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:X509Credential"/>
@@ -96,9 +91,6 @@
             <documentation>
                 Allows credential components to be specified by filesystem path.

[... 20 lines stripped ...]