[java-identity-provider] branch master updated: IDP-1375 Remove all the deprecated Filesystem Credentials
Rod Widdowson
rdw at steadingsoftware.com
Wed Mar 20 10:14:17 EDT 2019
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=50c45a7e363ec5b4f00f51aa1c426168088ce9e7
The following commit(s) were added to refs/heads/master by this push:
new 50c45a7 IDP-1375 Remove all the deprecated Filesystem Credentials
50c45a7 is described below
commit 50c45a7e363ec5b4f00f51aa1c426168088ce9e7
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Mar 20 13:47:25 2019 +0000
IDP-1375 Remove all the deprecated Filesystem Credentials
X509, PKIX and Basic
https://issues.shibboleth.net/jira/browse/IDP-1375
---
.../BasicResourceCredentialFactoryBean.java | 2 +-
.../filter/impl/SignatureValidationParser.java | 2 +-
.../impl/BasicResourceCredentialParser.java | 24 ++-----------
.../impl/X509ResourceCredentialParser.java | 23 ++----------
.../security/impl/SecurityNamespaceHandler.java | 6 ----
.../impl/PKIXResourceValidationInfoParser.java | 24 ++-----------
.../credential/BasicResourceParserTest.java | 12 +++----
.../credential/X509FilesystemParserTest.java | 10 +++---
.../trustengine/PKIXFilesystemParserTest.java | 4 +--
.../switch-metadata-trustengine-inline-filter.xml | 2 +-
...KeyName.xml => resourceCertElementsKeyName.xml} | 2 +-
.../{fileCertOnly.xml => resourceCertOnly.xml} | 2 +-
.../{fileKeyCertCrl.xml => resourceKeyCertCrl.xml} | 2 +-
.../{filePublicOnly.xml => resourcePublicOnly.xml} | 0
...PublicPrivate.xml => resourcePublicPrivate.xml} | 2 +-
...etAESBase64.xml => resourceSecretAESBase64.xml} | 0
...etAESBinary.xml => resourceSecretAESBinary.xml} | 0
...leSecretAESHex.xml => resourceSecretAESHex.xml} | 0
.../{fileTwoCert.xml => resourceTwoCert.xml} | 2 +-
.../{fileWrongCert.xml => resourceWrongCert.xml} | 2 +-
...fileWrongPublic.xml => resourceWrongPublic.xml} | 2 +-
...lidationInfo.xml => resourceValidationInfo.xml} | 0
...Values.xml => resourceValidationInfoValues.xml} | 2 +-
.../staticPKIXCredentials-nameCheckDisabled.xml | 2 +-
.../security/trustengine/staticPKIXCredentials.xml | 2 +-
.../security/trustengine/staticPKIXValues.xml | 2 +-
.../trustengine/staticPKIXValuesCertPathOpts.xml | 2 +-
.../main/resources/schema/shibboleth-security.xsd | 42 ----------------------
28 files changed, 34 insertions(+), 141 deletions(-)
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/BasicResourceCredentialFactoryBean.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/BasicResourceCredentialFactoryBean.java
index f12d400..aa3b603 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/BasicResourceCredentialFactoryBean.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/BasicResourceCredentialFactoryBean.java
@@ -37,7 +37,7 @@ import org.springframework.core.io.Resource;
import com.google.common.io.ByteStreams;
/**
- * Factory bean for BasicFilesystem & BasicResourceBacked Credentials.
+ * Spring bean factory for producing a {@link org.opensaml.security.credential.BasicCredential} from {@link Resource}s.
*/
public class BasicResourceCredentialFactoryBean extends AbstractBasicCredentialFactoryBean {
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java
index dcd73b4..c82a959 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java
@@ -212,7 +212,7 @@ public class SignatureValidationParser extends AbstractSingleBeanDefinitionParse
}
/**
- * Build (the definition) for a X509Filesystem Credential.
+ * Build (the definition) for a X509 Credential.
*
* @param attribute the name of the certificate file
* @return the bean definition.
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/BasicResourceCredentialParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/BasicResourceCredentialParser.java
index 8d1548a..bbbd59f 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/BasicResourceCredentialParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/BasicResourceCredentialParser.java
@@ -19,42 +19,22 @@ package net.shibboleth.idp.profile.spring.relyingparty.security.credential.impl;
import javax.xml.namespace.QName;
+import org.w3c.dom.Element;
+
import net.shibboleth.idp.profile.spring.factory.BasicResourceCredentialFactoryBean;
import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
-import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.w3c.dom.Element;
/**
* Parser for BasicFilesystem and BasicResourceBacked Credentials.
*/
public class BasicResourceCredentialParser extends AbstractBasicCredentialParser {
- /** Element Name for Filesystem. */
- public static final QName TYPE_NAME_FILESYSTEM = new QName(AbstractMetadataProviderParser.SECURITY_NAMESPACE,
- "BasicFilesystem");
-
/** Type for Resource. */
public static final QName TYPE_NAME_RESOURCE = new QName(AbstractMetadataProviderParser.SECURITY_NAMESPACE,
"BasicResourceBacked");
- /** log. */
- private final Logger log = LoggerFactory.getLogger(BasicResourceCredentialParser.class);
-
/** {@inheritDoc} */
@Override protected Class<?> getBeanClass(final Element element) {
return BasicResourceCredentialFactoryBean.class;
}
-
- /** {@inheritDoc} */
- @Override protected void doParse(final Element element, final BeanDefinitionBuilder builder) {
- if (TYPE_NAME_FILESYSTEM.equals(DOMTypeSupport.getXSIType(element))) {
- log.warn("Credential type '{}' has been deprecated; use the compatible Credential type '{}'",
- TYPE_NAME_FILESYSTEM.getLocalPart(), TYPE_NAME_RESOURCE.getLocalPart());
- }
- super.doParse(element, builder);
- }
}
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/X509ResourceCredentialParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/X509ResourceCredentialParser.java
index 627467a..b69c463 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/X509ResourceCredentialParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/X509ResourceCredentialParser.java
@@ -19,42 +19,23 @@ package net.shibboleth.idp.profile.spring.relyingparty.security.credential.impl;
import javax.xml.namespace.QName;
+import org.w3c.dom.Element;
+
import net.shibboleth.idp.profile.spring.factory.BasicX509CredentialFactoryBean;
import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
-import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.w3c.dom.Element;
/**
* Parser for X509Filesystem credentials.
*/
public class X509ResourceCredentialParser extends AbstractX509CredentialParser {
- /** Element Name for Filesystem. */
- public static final QName TYPE_NAME_FILESYSTEM = new QName(AbstractMetadataProviderParser.SECURITY_NAMESPACE,
- "X509Filesystem");
-
/** Type for X509 credentials. */
public static final QName TYPE_NAME_RESOURCE = new QName(AbstractMetadataProviderParser.SECURITY_NAMESPACE,
"X509ResourceBacked");
- /** log. */
- private final Logger log = LoggerFactory.getLogger(X509ResourceCredentialParser.class);
-
@Override protected Class<?> getBeanClass(final Element element) {
return BasicX509CredentialFactoryBean.class;
}
- /** {@inheritDoc} */
- @Override protected void doParse(final Element element, final BeanDefinitionBuilder builder) {
- if (TYPE_NAME_FILESYSTEM.equals(DOMTypeSupport.getXSIType(element))) {
- log.warn("Credential type '{}' has been deprecated; use the compatible Credential type '{}'",
- TYPE_NAME_FILESYSTEM.getLocalPart(), TYPE_NAME_RESOURCE.getLocalPart());
- }
- super.doParse(element, builder);
- }
}
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/impl/SecurityNamespaceHandler.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/impl/SecurityNamespaceHandler.java
index f2fbad8..004f4eb 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/impl/SecurityNamespaceHandler.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/impl/SecurityNamespaceHandler.java
@@ -50,14 +50,10 @@ public class SecurityNamespaceHandler extends BaseSpringNamespaceHandler {
/** {@inheritDoc} */
@Override public void init() {
// Credentials
- registerBeanDefinitionParser(X509ResourceCredentialParser.TYPE_NAME_FILESYSTEM,
- new X509ResourceCredentialParser());
registerBeanDefinitionParser(X509ResourceCredentialParser.TYPE_NAME_RESOURCE,
new X509ResourceCredentialParser());
registerBeanDefinitionParser(X509InlineCredentialParser.TYPE_NAME, new X509InlineCredentialParser());
registerBeanDefinitionParser(BasicInlineCredentialParser.TYPE_NAME, new BasicInlineCredentialParser());
- registerBeanDefinitionParser(BasicResourceCredentialParser.TYPE_NAME_FILESYSTEM,
- new BasicResourceCredentialParser());
registerBeanDefinitionParser(BasicResourceCredentialParser.TYPE_NAME_RESOURCE,
new BasicResourceCredentialParser());
@@ -67,8 +63,6 @@ public class SecurityNamespaceHandler extends BaseSpringNamespaceHandler {
registerBeanDefinitionParser(SignatureChainingParser.TYPE_NAME, new SignatureChainingParser());
// Validation Info
- registerBeanDefinitionParser(PKIXResourceValidationInfoParser.TYPE_NAME_FILESYSTEM,
- new PKIXResourceValidationInfoParser());
registerBeanDefinitionParser(PKIXResourceValidationInfoParser.TYPE_NAME_RESOURCE,
new PKIXResourceValidationInfoParser());
registerBeanDefinitionParser(PKIXInlineValidationInfoParser.SCHEMA_TYPE, new PKIXInlineValidationInfoParser());
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/PKIXResourceValidationInfoParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/PKIXResourceValidationInfoParser.java
index 6967dcf..2096ee9 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/PKIXResourceValidationInfoParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/PKIXResourceValidationInfoParser.java
@@ -19,14 +19,10 @@ package net.shibboleth.idp.profile.spring.relyingparty.security.trustengine.impl
import javax.xml.namespace.QName;
-import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
-import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.w3c.dom.Element;
+import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
+
/**
* Parser for <ValidationInfo type="PKIXFilesystem"> and <ValidationInfo type="PKIXResourceBacked">.<br/>
*
@@ -35,28 +31,12 @@ import org.w3c.dom.Element;
*/
public class PKIXResourceValidationInfoParser extends AbstractPKIXValidationInfoParser {
- /** Element Name. */
- public static final QName TYPE_NAME_FILESYSTEM = new QName(AbstractMetadataProviderParser.SECURITY_NAMESPACE,
- "PKIXFilesystem");
-
/** Schema type for PKIXResourceBackedValidationInformation. */
public static final QName TYPE_NAME_RESOURCE = new QName(AbstractMetadataProviderParser.SECURITY_NAMESPACE,
"PKIXResourceBacked");
- /** log. */
- private final Logger log = LoggerFactory.getLogger(PKIXResourceValidationInfoParser.class);
-
/** {@inheritDoc} */
@Override protected Class<?> getBeanClass(final Element element) {
return PKIXResourceValidationInfoFactoryBean.class;
}
-
- /** {@inheritDoc} */
- @Override protected void doParse(final Element element, final BeanDefinitionBuilder builder) {
- if (TYPE_NAME_FILESYSTEM.equals(DOMTypeSupport.getXSIType(element))) {
- log.warn("Credential type '{}' has been deprecated; use the compatible Credential type '{}'",
- TYPE_NAME_FILESYSTEM.getLocalPart(), TYPE_NAME_RESOURCE.getLocalPart());
- }
- super.doParse(element, builder);
- }
}
diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/BasicResourceParserTest.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/BasicResourceParserTest.java
index 4ded4b7..cb2436d 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/BasicResourceParserTest.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/BasicResourceParserTest.java
@@ -36,25 +36,25 @@ public class BasicResourceParserTest extends AbstractSecurityParserTest {
@Test public void publicOnly() throws IOException {
final BasicCredential credential =
- (BasicCredential) getBean(Credential.class, "credential/filePublicOnly.xml");
+ (BasicCredential) getBean(Credential.class, "credential/resourcePublicOnly.xml");
Assert.assertNull(credential.getPrivateKey());
}
@Test(expectedExceptions={BeanCreationException.class,}) public void wrongCert() throws IOException {
- getBean(Credential.class, "credential/fileWrongPublic.xml");
+ getBean(Credential.class, "credential/resourceWrongPublic.xml");
}
@Test public void publicPrivate() throws IOException {
final BasicCredential credential =
- (BasicCredential) getBean(Credential.class, "credential/filePublicPrivate.xml");
+ (BasicCredential) getBean(Credential.class, "credential/resourcePublicPrivate.xml");
Assert.assertNotNull(credential.getPrivateKey());
}
@Test public void secretBase64() throws IOException {
final BasicCredential credential =
- (BasicCredential) getBean(Credential.class, "credential/fileSecretAESBase64.xml");
+ (BasicCredential) getBean(Credential.class, "credential/resourceSecretAESBase64.xml");
Assert.assertNotNull(credential.getSecretKey());
SecretKey key = credential.getSecretKey();
Assert.assertEquals(key.getAlgorithm(), "AES");
@@ -62,7 +62,7 @@ public class BasicResourceParserTest extends AbstractSecurityParserTest {
@Test public void secretHex() throws IOException {
final BasicCredential credential =
- (BasicCredential) getBean(Credential.class, "credential/fileSecretAESHex.xml");
+ (BasicCredential) getBean(Credential.class, "credential/resourceSecretAESHex.xml");
Assert.assertNotNull(credential.getSecretKey());
SecretKey key = credential.getSecretKey();
Assert.assertEquals(key.getAlgorithm(), "AES");
@@ -70,7 +70,7 @@ public class BasicResourceParserTest extends AbstractSecurityParserTest {
@Test public void secretBinary() throws IOException {
final BasicCredential credential =
- (BasicCredential) getBean(Credential.class, "credential/fileSecretAESBinary.xml");
+ (BasicCredential) getBean(Credential.class, "credential/resourceSecretAESBinary.xml");
Assert.assertNotNull(credential.getSecretKey());
SecretKey key = credential.getSecretKey();
Assert.assertEquals(key.getAlgorithm(), "AES");
diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/X509FilesystemParserTest.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/X509FilesystemParserTest.java
index 89501c1..d4b477c 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/X509FilesystemParserTest.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/X509FilesystemParserTest.java
@@ -39,7 +39,7 @@ public class X509FilesystemParserTest extends AbstractSecurityParserTest {
}
@Test public void certOnly() throws IOException {
- final BasicX509Credential credential = lookup("fileCertOnly.xml");
+ final BasicX509Credential credential = lookup("resourceCertOnly.xml");
Assert.assertEquals(credential.getEntityCertificateChain().size(), 1);
Assert.assertTrue(credential.getEntityCertificateChain().contains(credential.getEntityCertificate()));
@@ -49,15 +49,15 @@ public class X509FilesystemParserTest extends AbstractSecurityParserTest {
}
@Test(expectedExceptions = {BeanCreationException.class,}) public void twoCert() throws IOException {
- lookup("fileTwoCert.xml");
+ lookup("resourceTwoCert.xml");
}
@Test(expectedExceptions = {BeanCreationException.class,}) public void wrongCert() throws IOException {
- lookup("fileWrongCert.xml");
+ lookup("resourceWrongCert.xml");
}
@Test public void certKeyCrl() throws IOException {
- final BasicX509Credential credential = lookup("fileKeyCertCrl.xml");
+ final BasicX509Credential credential = lookup("resourceKeyCertCrl.xml");
Assert.assertEquals(credential.getEntityCertificate().getNotAfter().getTime(),
Instant.parse("2024-04-08T13:39:18Z").toEpochMilli());
@@ -69,7 +69,7 @@ public class X509FilesystemParserTest extends AbstractSecurityParserTest {
}
@Test public void certElementsKeyNames() throws IOException {
- final BasicX509Credential credential = lookup("fileCertElementsKeyName.xml");
+ final BasicX509Credential credential = lookup("resourceCertElementsKeyName.xml");
Assert.assertEquals(credential.getEntityCertificateChain().size(), 1);
Assert.assertTrue(credential.getEntityCertificateChain().contains(credential.getEntityCertificate()));
diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/PKIXFilesystemParserTest.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/PKIXFilesystemParserTest.java
index 9b4b6e0..aee9c57 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/PKIXFilesystemParserTest.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/PKIXFilesystemParserTest.java
@@ -36,14 +36,14 @@ public class PKIXFilesystemParserTest extends AbstractSecurityParserTest {
}
@Test public void simple() throws IOException {
- final BasicPKIXValidationInformation info = lookup("filesystemValidationInfo.xml");
+ final BasicPKIXValidationInformation info = lookup("resourceValidationInfo.xml");
Assert.assertNull(info.getVerificationDepth());
Assert.assertTrue(info.getCertificates().isEmpty());
Assert.assertTrue(info.getCRLs().isEmpty());
}
@Test public void complex() throws IOException {
- final BasicPKIXValidationInformation info = lookup("filesystemValidationInfoValues.xml");
+ final BasicPKIXValidationInformation info = lookup("resourceValidationInfoValues.xml");
Assert.assertEquals(info.getVerificationDepth().intValue(), 99);
Assert.assertEquals(info.getCertificates().size(), 2);
Assert.assertEquals(info.getCRLs().size(), 1);
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline-filter.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline-filter.xml
index e7848ed..9b3f364 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline-filter.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline-filter.xml
@@ -11,7 +11,7 @@
<metadata:MetadataFilter xsi:type="metadata:SignatureValidation">
<security:TrustEngine id="MyTrustEngine" xsi:type="security:StaticExplicitKeySignature">
- <security:Credential id="IdPCredential" xsi:type="security:X509Filesystem">
+ <security:Credential id="IdPCredential" xsi:type="security:X509ResourceBacked">
<security:Certificate>%{DIR}/filter/switch.pem</security:Certificate>
</security:Credential>
</security:TrustEngine>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileCertElementsKeyName.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceCertElementsKeyName.xml
similarity index 78%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileCertElementsKeyName.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceCertElementsKeyName.xml
index 8376f7f..2e29412 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileCertElementsKeyName.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceCertElementsKeyName.xml
@@ -2,7 +2,7 @@
<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- id="IdPCredential" xsi:type="security:X509Filesystem" entityID="https://sp.example.org/sp/shibboleth" usage="Signing" >
+ id="IdPCredential" xsi:type="security:X509ResourceBacked" entityID="https://sp.example.org/sp/shibboleth" usage="Signing" >
<security:KeyName>Name1</security:KeyName>
<security:KeyName>Name2</security:KeyName>
<security:Certificate>%{DIR}/credential/cert.pem</security:Certificate>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileCertOnly.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceCertOnly.xml
similarity index 87%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileCertOnly.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceCertOnly.xml
index e3ba0db..e7c8ce9 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileCertOnly.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceCertOnly.xml
@@ -2,7 +2,7 @@
<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- id="IdPCredential" xsi:type="security:X509Filesystem">
+ id="IdPCredential" xsi:type="security:X509ResourceBacked">
<security:Certificate>classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/credential/cert.pem</security:Certificate>
</security:Credential>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileKeyCertCrl.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceKeyCertCrl.xml
similarity index 91%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileKeyCertCrl.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceKeyCertCrl.xml
index 215069e..be79fa8 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileKeyCertCrl.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceKeyCertCrl.xml
@@ -2,7 +2,7 @@
<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- id="IdPCredential" xsi:type="security:X509Filesystem">
+ id="IdPCredential" xsi:type="security:X509ResourceBacked">
<security:PrivateKey>%{DIR}/credential/key.pem</security:PrivateKey>
<security:Certificate>%{DIR}/credential/certificate.pem</security:Certificate>
<security:Certificate entityCertificate="true">%{DIR}/credential/cert.pem</security:Certificate>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/filePublicOnly.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourcePublicOnly.xml
similarity index 100%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/filePublicOnly.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourcePublicOnly.xml
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/filePublicPrivate.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourcePublicPrivate.xml
similarity index 88%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/filePublicPrivate.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourcePublicPrivate.xml
index cbd11aa..40c917f 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/filePublicPrivate.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourcePublicPrivate.xml
@@ -2,7 +2,7 @@
<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- id="IdPCredential" xsi:type="security:BasicFilesystem">
+ id="IdPCredential" xsi:type="security:BasicResourceBacked">
<security:PrivateKey>%{DIR}/credential/key.pem</security:PrivateKey>
<security:PublicKey>%{DIR}/credential/publicKey.pem</security:PublicKey>
</security:Credential>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileSecretAESBase64.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceSecretAESBase64.xml
similarity index 100%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileSecretAESBase64.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceSecretAESBase64.xml
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileSecretAESBinary.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceSecretAESBinary.xml
similarity index 100%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileSecretAESBinary.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceSecretAESBinary.xml
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileSecretAESHex.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceSecretAESHex.xml
similarity index 100%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileSecretAESHex.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceSecretAESHex.xml
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileTwoCert.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceTwoCert.xml
similarity index 87%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileTwoCert.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceTwoCert.xml
index c853711..5c840bf 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileTwoCert.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceTwoCert.xml
@@ -2,7 +2,7 @@
<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- id="IdPCredential" xsi:type="security:X509Filesystem">
+ id="IdPCredential" xsi:type="security:X509ResourceBacked">
<security:Certificate entityCertificate="true">%{DIR}/credential/certificate.pem</security:Certificate>
</security:Credential>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileWrongCert.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceWrongCert.xml
similarity index 88%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileWrongCert.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceWrongCert.xml
index 9cbda29..1d90f7f 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileWrongCert.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceWrongCert.xml
@@ -2,7 +2,7 @@
<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- id="IdPCredential" xsi:type="security:X509Filesystem">
+ id="IdPCredential" xsi:type="security:X509ResourceBacked">
<security:PrivateKey>%{DIR}/credential/key.pem</security:PrivateKey>
<security:Certificate>%{DIR}/credential/certificate.pem</security:Certificate>
</security:Credential>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileWrongPublic.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceWrongPublic.xml
similarity index 88%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileWrongPublic.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceWrongPublic.xml
index 1a07d3a..fd37c2e 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileWrongPublic.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceWrongPublic.xml
@@ -2,7 +2,7 @@
<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- id="IdPCredential" xsi:type="security:BasicFilesystem">
+ id="IdPCredential" xsi:type="security:BasicResourceBacked">
<security:PrivateKey>%{DIR}/credential/key.pem</security:PrivateKey>
<security:PublicKey>%{DIR}/credential/wrongPublicKey.pem</security:PublicKey>
</security:Credential>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/filesystemValidationInfo.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/resourceValidationInfo.xml
similarity index 100%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/filesystemValidationInfo.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/resourceValidationInfo.xml
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/filesystemValidationInfoValues.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/resourceValidationInfoValues.xml
similarity index 87%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/filesystemValidationInfoValues.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/resourceValidationInfoValues.xml
index 3aec7ee..c8264fb 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/filesystemValidationInfoValues.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/resourceValidationInfoValues.xml
@@ -2,7 +2,7 @@
<security:ValidationInfo xmlns:security="urn:mace:shibboleth:2.0:security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- id="validInfoValues" xsi:type="security:PKIXFilesystem" verifyDepth="99">
+ id="validInfoValues" xsi:type="security:PKIXResourceBacked" verifyDepth="99">
<security:Certificate>%{DIR}/trustengine/cert.pem</security:Certificate>
<security:Certificate>classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/cert.pem</security:Certificate>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXCredentials-nameCheckDisabled.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXCredentials-nameCheckDisabled.xml
index b723c17..10468c5 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXCredentials-nameCheckDisabled.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXCredentials-nameCheckDisabled.xml
@@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
<security:ValidationInfo id="PKIXFS"
- xsi:type="security:PKIXFilesystem" verifyDepth="99" />
+ xsi:type="security:PKIXResourceBacked" verifyDepth="99" />
<security:ValidationOptions xsi:type="security:CertPathValidationOptionsType"
processCredentialCRLs="false" processExpiredCRLs="false"
processEmptyCRLs="false" defaultVerificationDepth="3"
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXCredentials.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXCredentials.xml
index 6f5c967..552f3ac 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXCredentials.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXCredentials.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
<security:TrustedName>Name1</security:TrustedName>
<security:ValidationInfo id="PKIXFS"
- xsi:type="security:PKIXFilesystem" verifyDepth="99" />
+ xsi:type="security:PKIXResourceBacked" verifyDepth="99" />
<security:ValidationOptions xsi:type="security:CertPathValidationOptionsType"
processCredentialCRLs="false" processExpiredCRLs="false"
processEmptyCRLs="false" defaultVerificationDepth="3"
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValues.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValues.xml
index 7acfd3e..19dc58d 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValues.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValues.xml
@@ -7,7 +7,7 @@
<security:TrustedName>Name2</security:TrustedName>
<security:TrustedName>Name3</security:TrustedName>
<security:ValidationInfo id="PKIXFS"
- xsi:type="security:PKIXFilesystem" verifyDepth="99" />
+ xsi:type="security:PKIXResourceBacked" verifyDepth="99" />
<security:ValidationInfo id="PKIXIL"
xsi:type="security:PKIXInline" verifyDepth="98" />
<security:ValidationOptions
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValuesCertPathOpts.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValuesCertPathOpts.xml
index 4383770..deacbff 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValuesCertPathOpts.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValuesCertPathOpts.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
<security:TrustedName>Name1</security:TrustedName>
<security:ValidationInfo id="PKIXFS"
- xsi:type="security:PKIXFilesystem" verifyDepth="99" />
+ xsi:type="security:PKIXResourceBacked" verifyDepth="99" />
<security:ValidationOptions xsi:type="security:CertPathValidationOptionsType"
processCredentialCRLs="false" processExpiredCRLs="false"
processEmptyCRLs="false" defaultVerificationDepth="3"
diff --git a/idp-schema/src/main/resources/schema/shibboleth-security.xsd b/idp-schema/src/main/resources/schema/shibboleth-security.xsd
index 1fb16f1..7750b37 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-security.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-security.xsd
@@ -16,20 +16,6 @@
</complexContent>
</complexType>
- <complexType name="X509Filesystem">
- <annotation>
- <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 credential is deprecated in favor of X509ResourceBacked
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:X509Credential"/>
- </complexContent>
- </complexType>
-
<complexType name="X509ResourceBacked">
<annotation>
<documentation>
@@ -91,20 +77,6 @@
</complexContent>
</complexType>
- <complexType name="BasicFilesystem">
- <annotation>
- <documentation>
- Allows credential components to be specified by filesystem path.
- Keys may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
-
- This is deprecated in favor of BasicResourceBacked
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:BasicCredential"/>
- </complexContent>
- </complexType>
-
<complexType name="BasicResourceBacked">
<annotation>
<documentation>
@@ -247,20 +219,6 @@
</complexContent>
</complexType>
- <complexType name="PKIXFilesystem">
- <annotation>
- <documentation>
- Allows PKIX validation info components to be specified by filesystem path.
- 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 PKIXResourceBacked type employing a filesystem resource.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:PKIXValidationInfoType"/>
- </complexContent>
- </complexType>
-
<complexType name="PKIXResourceBacked">
<annotation>
<documentation>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list