[java-opensaml] branch master updated: IDP-1146: Replace unit test usage of Subversion repo resources with Git
Brent Putman
putmanb at georgetown.edu
Mon Mar 20 21:32:26 EDT 2017
This is an automated email from the git hooks/post-receive script.
putmanb pushed a commit to branch master
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=18e28e4110a73eb3ff41902827f458e32b387d69
The following commit(s) were added to refs/heads/master by this push:
new 18e28e4 IDP-1146: Replace unit test usage of Subversion repo resources with Git
18e28e4 is described below
commit 18e28e4110a73eb3ff41902827f458e32b387d69
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Mon Mar 20 21:32:24 2017 -0400
IDP-1146: Replace unit test usage of Subversion repo resources with Git
---
opensaml-saml-impl/pom.xml | 6 +++
.../resolver/filter/impl/EntityRoleFilterTest.java | 4 +-
.../filter/impl/SchemaValidationFilterTest.java | 4 +-
.../impl/FileBackedHTTPMetadataResolverTest.java | 47 ++++++++++---------
...ctionDrivenDynamicHTTPMetadataResolverTest.java | 45 +++++++++---------
.../resolver/impl/HTTPMetadataResolverTest.java | 53 +++++++++++-----------
.../saml/metadata/resolver/impl/repo-entity.crt | 32 +++++++++++++
.../impl/{svn-rootCA.crt => repo-rootCA.crt} | 0
.../saml/metadata/resolver/impl/svn-entity.crt | 33 --------------
opensaml-xmlsec-impl/pom.xml | 7 +++
.../signature/support/DetachedSignatureTest.java | 16 ++++---
11 files changed, 133 insertions(+), 114 deletions(-)
diff --git a/opensaml-saml-impl/pom.xml b/opensaml-saml-impl/pom.xml
index 009c804..14006f9 100644
--- a/opensaml-saml-impl/pom.xml
+++ b/opensaml-saml-impl/pom.xml
@@ -141,6 +141,12 @@
<artifactId>spring-extensions</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java
index edb0777..856bab0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java
@@ -31,6 +31,8 @@ import org.opensaml.saml.saml2.metadata.SPSSODescriptor;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.repository.RepositorySupport;
+
/**
* Unit tests for {@link EntityRoleFilter}.
*/
@@ -47,7 +49,7 @@ public class EntityRoleFilterTest extends XMLObjectBaseTestCase {
httpClient = new DefaultHttpClient();
httpClient.getParams().setIntParameter(AllClientPNames.CONNECTION_TIMEOUT, 1000 * 5);
- inCommonMDURL = "http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/saml2/metadata/InCommon-metadata.xml?content-type=text%2Fplain&view=co";
+ inCommonMDURL = RepositorySupport.buildHTTPSResourceURL("java-opensaml", "opensaml-saml-impl/src/test/resources/org/opensaml/saml/saml2/metadata/InCommon-metadata.xml");
}
@Test
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilterTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilterTest.java
index 353ea4a..18e128a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilterTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilterTest.java
@@ -26,6 +26,8 @@ import org.opensaml.saml.metadata.resolver.impl.HTTPMetadataResolver;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.repository.RepositorySupport;
+
/**
* Unit tests for {@link SchemaValidationFilter}.
*/
@@ -42,7 +44,7 @@ public class SchemaValidationFilterTest extends XMLObjectBaseTestCase {
httpClient = new DefaultHttpClient();
httpClient.getParams().setIntParameter(AllClientPNames.CONNECTION_TIMEOUT, 1000 * 5);
- inCommonMDURL = "http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/saml2/metadata/InCommon-metadata.xml?content-type=text%2Fplain&view=co";
+ inCommonMDURL = RepositorySupport.buildHTTPSResourceURL("java-opensaml", "opensaml-saml-impl/src/test/resources/org/opensaml/saml/saml2/metadata/InCommon-metadata.xml");
}
@Test
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
index 9b55a20..9b44215 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
@@ -58,6 +58,7 @@ import com.google.common.io.Resources;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
import net.shibboleth.utilities.java.support.httpclient.HttpClientSupport;
+import net.shibboleth.utilities.java.support.repository.RepositorySupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
@@ -72,8 +73,7 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
private HttpClientBuilder httpClientBuilder;
private String relativeMDResource;
- private String httpsMDURL;
- private String httpMDURL;
+ private String metadataURL;
private String badMDURL;
private String backupFilePath;
private FileBackedHTTPMetadataResolver metadataProvider;
@@ -85,8 +85,7 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
httpClientBuilder = new HttpClientBuilder();
relativeMDResource = "org/opensaml/saml/metadata/resolver/impl/08ced64cddc9f1578598b2cf71ae747b11d11472.xml";
- httpsMDURL = String.format("https://svn.shibboleth.net/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/%s", relativeMDResource);
- httpMDURL = String.format("http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/%s?view=co", relativeMDResource);
+ metadataURL = RepositorySupport.buildHTTPSResourceURL("java-opensaml", String.format("opensaml-saml-impl/src/test/resources/%s", relativeMDResource));
entityID = "https://www.example.org/sp";
badMDURL = "http://www.opensaml.org/foo/bar/baz/samlmd";
@@ -109,7 +108,7 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
*/
@Test
public void testGetEntityDescriptor() throws Exception {
- metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpMDURL, backupFilePath);
+ metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL, backupFilePath);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
metadataProvider.initialize();
@@ -167,7 +166,7 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
public void testFailFastBadBackupFile() throws Exception {
try {
// Use a known existing directory as backup file path, which is an invalid argument.
- metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpMDURL, System.getProperty("java.io.tmpdir"));
+ metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL, System.getProperty("java.io.tmpdir"));
} catch (ResolverException e) {
Assert.fail("Provider failed bad backup file in constructor");
@@ -192,7 +191,7 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
public void testNoFailFastBadBackupFile() throws Exception {
try {
// Use a known existing directory as backup file path, which is an invalid argument.
- metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpMDURL, System.getProperty("java.io.tmpdir"));
+ metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL, System.getProperty("java.io.tmpdir"));
} catch (ResolverException e) {
Assert.fail("Provider failed bad backup file in constructor");
@@ -227,7 +226,7 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
Assert.assertTrue(backupFile.exists(), "Backup file was not created");
Assert.assertTrue(backupFile.length() > 0, "Backup file contains no data");
- metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpMDURL, backupFilePath);
+ metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL, backupFilePath);
metadataProvider.setParserPool(parserPool);
metadataProvider.setFailFastInitialization(true);
metadataProvider.setId("test");
@@ -296,7 +295,7 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
// Make sure resolver works when TrustEngine socket factory is configured but just using an HTTP URL.
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL, backupFilePath);
+ metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL, backupFilePath);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
metadataProvider.initialize();
@@ -311,10 +310,10 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
// Make sure resolver works when TrustEngine socket factory is configured but just using an HTTP URL.
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL, backupFilePath);
+ metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL, backupFilePath);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
- metadataProvider.setTLSTrustEngine(buildExplicitKeyTrustEngine("svn-entity.crt"));
+ metadataProvider.setTLSTrustEngine(buildExplicitKeyTrustEngine("repo-entity.crt"));
metadataProvider.initialize();
EntityDescriptor descriptor = metadataProvider.resolveSingle(criteriaSet);
@@ -326,7 +325,7 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
public void testHTTPSNoTrustEngine() throws Exception {
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL, backupFilePath);
+ metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL, backupFilePath);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
metadataProvider.initialize();
@@ -340,10 +339,10 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
public void testHTTPSTrustEngineExplicitKey() throws Exception {
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL, backupFilePath);
+ metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL, backupFilePath);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
- metadataProvider.setTLSTrustEngine(buildExplicitKeyTrustEngine("svn-entity.crt"));
+ metadataProvider.setTLSTrustEngine(buildExplicitKeyTrustEngine("repo-entity.crt"));
metadataProvider.initialize();
EntityDescriptor descriptor = metadataProvider.resolveSingle(criteriaSet);
@@ -356,7 +355,7 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
public void testHTTPSTrustEngineInvalidKey() throws Exception {
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL, backupFilePath);
+ metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL, backupFilePath);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
metadataProvider.setTLSTrustEngine(buildExplicitKeyTrustEngine("badKey.crt"));
@@ -371,10 +370,10 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
public void testHTTPSTrustEngineValidPKIX() throws Exception {
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL, backupFilePath);
+ metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL, backupFilePath);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
- metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("svn-rootCA.crt", null, false));
+ metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("repo-rootCA.crt", null, false));
metadataProvider.initialize();
EntityDescriptor descriptor = metadataProvider.resolveSingle(criteriaSet);
@@ -386,10 +385,10 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
public void testHTTPSTrustEngineValidPKIXExplicitName() throws Exception {
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL, backupFilePath);
+ metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL, backupFilePath);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
- metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("svn-rootCA.crt", "*.shibboleth.net", true));
+ metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("repo-rootCA.crt", "*.shibboleth.net", true));
metadataProvider.initialize();
EntityDescriptor descriptor = metadataProvider.resolveSingle(criteriaSet);
@@ -401,7 +400,7 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
public void testHTTPSTrustEngineInvalidPKIX() throws Exception {
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL, backupFilePath);
+ metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL, backupFilePath);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("badCA.crt", null, false));
@@ -416,10 +415,10 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
public void testHTTPSTrustEngineValidPKIXInvalidName() throws Exception {
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL, backupFilePath);
+ metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL, backupFilePath);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
- metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("svn-rootCA.crt", "foobar.shibboleth.net", true));
+ metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("repo-rootCA.crt", "foobar.shibboleth.net", true));
metadataProvider.initialize();
EntityDescriptor descriptor = metadataProvider.resolveSingle(criteriaSet);
@@ -430,10 +429,10 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
@Test(expectedExceptions=ComponentInitializationException.class)
public void testHTTPSTrustEngineWrongSocketFactory() throws Exception {
// Trust engine set, but appropriate socket factory not set
- metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL, backupFilePath);
+ metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL, backupFilePath);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
- metadataProvider.setTLSTrustEngine(buildExplicitKeyTrustEngine("svn-entity.crt"));
+ metadataProvider.setTLSTrustEngine(buildExplicitKeyTrustEngine("repo-entity.crt"));
metadataProvider.initialize();
EntityDescriptor descriptor = metadataProvider.resolveSingle(criteriaSet);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
index 6a685a9..5554b1c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
@@ -29,6 +29,7 @@ import net.shibboleth.utilities.java.support.codec.StringDigester;
import net.shibboleth.utilities.java.support.codec.StringDigester.OutputFormat;
import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
import net.shibboleth.utilities.java.support.httpclient.HttpClientSupport;
+import net.shibboleth.utilities.java.support.repository.RepositorySupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.velocity.VelocityEngine;
@@ -78,7 +79,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
@Test
public void testTemplateFromRepoDefaultContentTypes() throws Exception {
// Repo should return 'text/xml', which is supported by default.
- String template = "http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml?view=co";
+ String template = RepositorySupport.buildHTTPSResourceURL("java-opensaml", "opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml");
String entityID = "https://www.example.org/sp";
// Digesting the entityID is a little artificial for the test, but means we can test more easily against a path in the repo.
@@ -102,10 +103,11 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
Assert.assertNull(ed.getDOM());
}
- @Test
+ //TODO disabled b/c gitweb currently doesn't seem to have a way to request a different MIME type
+ @Test(enabled=false)
public void testTemplateFromRepoWithExplicitContentType() throws Exception {
// Explicitly request 'text/plain', and then configure it below to be supported. Also test case-insensitivity.
- String template = "http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml?content-type=text%2Fplain&view=co";
+ String template = RepositorySupport.buildHTTPSResourceURL("java-opensaml", "opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml");
String entityID = "https://www.example.org/sp";
// Digesting the entityID is a little artificial for the test, but means we can test more easily against a path in the repo.
@@ -130,10 +132,11 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
Assert.assertNull(ed.getDOM());
}
- @Test
+ //TODO disabled b/c gitweb currently doesn't seem to have a way to request a different MIME type
+ @Test(enabled=false)
public void testTemplateFromRepoUnsupportedContentType() throws Exception {
// Repo should return 'text/plain', which is not supported by default.
- String template = "http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml?content-type=text%2Fplain&view=co";
+ String template = RepositorySupport.buildHTTPSResourceURL("java-opensaml", "opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml");
String entityID = "https://www.example.org/sp";
// Digesting the entityID is a little artificial for the test, but means we can test more easily against a path in the repo.
@@ -245,7 +248,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
@Test
public void testTrustEngineSocketFactoryNoHTTPSNoTrustEngine() throws Exception {
- String template = "http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml?view=co";
+ String template = RepositorySupport.buildHTTPSResourceURL("java-opensaml", "opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml");
String entityID = "https://www.example.org/sp";
// Digesting the entityID is a little artificial for the test, but means we can test more easily against a path in the repo.
@@ -273,7 +276,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
@Test
public void testTrustEngineSocketFactoryNoHTTPSWithTrustEngine() throws Exception {
- String template = "http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml?view=co";
+ String template = RepositorySupport.buildHTTPSResourceURL("java-opensaml", "opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml");
String entityID = "https://www.example.org/sp";
// Digesting the entityID is a little artificial for the test, but means we can test more easily against a path in the repo.
@@ -289,7 +292,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
resolver.setId("myDynamicResolver");
resolver.setParserPool(parserPool);
resolver.setRequestURLBuilder(requestURLBuilder);
- resolver.setTLSTrustEngine(buildExplicitKeyTrustEngine("svn-entity.crt"));
+ resolver.setTLSTrustEngine(buildExplicitKeyTrustEngine("repo-entity.crt"));
resolver.initialize();
CriteriaSet criteriaSet = new CriteriaSet( new EntityIdCriterion(entityID));
@@ -302,7 +305,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
@Test
public void testHTTPSNoTrustEngine() throws Exception {
- String template = "https://svn.shibboleth.net/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml";
+ String template = RepositorySupport.buildHTTPSResourceURL("java-opensaml", "opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml");
String entityID = "https://www.example.org/sp";
// Digesting the entityID is a little artificial for the test, but means we can test more easily against a path in the repo.
@@ -330,7 +333,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
@Test
public void testHTTPSTrustEngineExplicitKey() throws Exception {
- String template = "https://svn.shibboleth.net/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml";
+ String template = RepositorySupport.buildHTTPSResourceURL("java-opensaml", "opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml");
String entityID = "https://www.example.org/sp";
// Digesting the entityID is a little artificial for the test, but means we can test more easily against a path in the repo.
@@ -346,7 +349,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
resolver.setId("myDynamicResolver");
resolver.setParserPool(parserPool);
resolver.setRequestURLBuilder(requestURLBuilder);
- resolver.setTLSTrustEngine(buildExplicitKeyTrustEngine("svn-entity.crt"));
+ resolver.setTLSTrustEngine(buildExplicitKeyTrustEngine("repo-entity.crt"));
resolver.initialize();
CriteriaSet criteriaSet = new CriteriaSet( new EntityIdCriterion(entityID));
@@ -359,7 +362,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
@Test
public void testHTTPSTrustEngineInvalidKey() throws Exception {
- String template = "https://svn.shibboleth.net/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml";
+ String template = RepositorySupport.buildHTTPSResourceURL("java-opensaml", "opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml");
String entityID = "https://www.example.org/sp";
// Digesting the entityID is a little artificial for the test, but means we can test more easily against a path in the repo.
@@ -386,7 +389,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
@Test
public void testHTTPSTrustEngineValidPKIX() throws Exception {
- String template = "https://svn.shibboleth.net/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml";
+ String template = RepositorySupport.buildHTTPSResourceURL("java-opensaml", "opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml");
String entityID = "https://www.example.org/sp";
// Digesting the entityID is a little artificial for the test, but means we can test more easily against a path in the repo.
@@ -402,7 +405,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
resolver.setId("myDynamicResolver");
resolver.setParserPool(parserPool);
resolver.setRequestURLBuilder(requestURLBuilder);
- resolver.setTLSTrustEngine(buildPKIXTrustEngine("svn-rootCA.crt", null, false));
+ resolver.setTLSTrustEngine(buildPKIXTrustEngine("repo-rootCA.crt", null, false));
resolver.initialize();
CriteriaSet criteriaSet = new CriteriaSet( new EntityIdCriterion(entityID));
@@ -415,7 +418,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
@Test
public void testHTTPSTrustEngineValidPKIXExplicitName() throws Exception {
- String template = "https://svn.shibboleth.net/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml";
+ String template = RepositorySupport.buildHTTPSResourceURL("java-opensaml", "opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml");
String entityID = "https://www.example.org/sp";
// Digesting the entityID is a little artificial for the test, but means we can test more easily against a path in the repo.
@@ -431,7 +434,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
resolver.setId("myDynamicResolver");
resolver.setParserPool(parserPool);
resolver.setRequestURLBuilder(requestURLBuilder);
- resolver.setTLSTrustEngine(buildPKIXTrustEngine("svn-rootCA.crt", "*.shibboleth.net", true));
+ resolver.setTLSTrustEngine(buildPKIXTrustEngine("repo-rootCA.crt", "*.shibboleth.net", true));
resolver.initialize();
CriteriaSet criteriaSet = new CriteriaSet( new EntityIdCriterion(entityID));
@@ -444,7 +447,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
@Test
public void testHTTPSTrustEngineInvalidPKIX() throws Exception {
- String template = "https://svn.shibboleth.net/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml";
+ String template = RepositorySupport.buildHTTPSResourceURL("java-opensaml", "opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml");
String entityID = "https://www.example.org/sp";
// Digesting the entityID is a little artificial for the test, but means we can test more easily against a path in the repo.
@@ -471,7 +474,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
@Test
public void testHTTPSTrustEngineValidPKIXInvalidName() throws Exception {
- String template = "https://svn.shibboleth.net/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml";
+ String template = RepositorySupport.buildHTTPSResourceURL("java-opensaml", "opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml");
String entityID = "https://www.example.org/sp";
// Digesting the entityID is a little artificial for the test, but means we can test more easily against a path in the repo.
@@ -487,7 +490,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
resolver.setId("myDynamicResolver");
resolver.setParserPool(parserPool);
resolver.setRequestURLBuilder(requestURLBuilder);
- resolver.setTLSTrustEngine(buildPKIXTrustEngine("svn-rootCA.crt", "foobar.shibboleth.net", true));
+ resolver.setTLSTrustEngine(buildPKIXTrustEngine("repo-rootCA.crt", "foobar.shibboleth.net", true));
resolver.initialize();
CriteriaSet criteriaSet = new CriteriaSet( new EntityIdCriterion(entityID));
@@ -498,7 +501,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
@Test
public void testHTTPSTrustEngineWrongSocketFactory() throws Exception {
- String template = "https://svn.shibboleth.net/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml";
+ String template = RepositorySupport.buildHTTPSResourceURL("java-opensaml", "opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml");
String entityID = "https://www.example.org/sp";
// Digesting the entityID is a little artificial for the test, but means we can test more easily against a path in the repo.
@@ -514,7 +517,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
resolver.setId("myDynamicResolver");
resolver.setParserPool(parserPool);
resolver.setRequestURLBuilder(requestURLBuilder);
- resolver.setTLSTrustEngine(buildExplicitKeyTrustEngine("svn-entity.crt"));
+ resolver.setTLSTrustEngine(buildExplicitKeyTrustEngine("repo-entity.crt"));
resolver.initialize();
CriteriaSet criteriaSet = new CriteriaSet( new EntityIdCriterion(entityID));
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
index 02c3b74..b318153 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
@@ -24,12 +24,6 @@ import java.security.cert.X509Certificate;
import java.util.Collections;
import java.util.Set;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientSupport;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
-
import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.opensaml.core.criterion.EntityIdCriterion;
@@ -52,6 +46,13 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
+import net.shibboleth.utilities.java.support.httpclient.HttpClientSupport;
+import net.shibboleth.utilities.java.support.repository.RepositorySupport;
+import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
+import net.shibboleth.utilities.java.support.resolver.ResolverException;
+
/**
* Unit tests for {@link HTTPMetadataResolver}.
*/
@@ -61,8 +62,7 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
private HttpClientBuilder httpClientBuilder;
- private String httpsMDURL;
- private String httpMDURL;
+ private String metadataURL;
private String badMDURL;
private String entityID;
private HTTPMetadataResolver metadataProvider;
@@ -72,13 +72,12 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
protected void setUp() throws Exception {
httpClientBuilder = new HttpClientBuilder();
- httpsMDURL = "https://svn.shibboleth.net/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/08ced64cddc9f1578598b2cf71ae747b11d11472.xml";
- httpMDURL = "http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/08ced64cddc9f1578598b2cf71ae747b11d11472.xml?view=co";
+ metadataURL = RepositorySupport.buildHTTPSResourceURL("java-opensaml", "opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/08ced64cddc9f1578598b2cf71ae747b11d11472.xml");
badMDURL = "http://www.google.com/";
entityID = "https://www.example.org/sp";
- metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), httpMDURL);
+ metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
metadataProvider.initialize();
@@ -141,7 +140,7 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
// Make sure resolver works when TrustEngine socket factory is configured but just using an HTTP URL.
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), httpMDURL);
+ metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
metadataProvider.initialize();
@@ -156,10 +155,10 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
// Make sure resolver works when TrustEngine socket factory is configured but just using an HTTP URL.
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), httpMDURL);
+ metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
- metadataProvider.setTLSTrustEngine(buildExplicitKeyTrustEngine("svn-entity.crt"));
+ metadataProvider.setTLSTrustEngine(buildExplicitKeyTrustEngine("repo-entity.crt"));
metadataProvider.initialize();
EntityDescriptor descriptor = metadataProvider.resolveSingle(criteriaSet);
@@ -171,7 +170,7 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
public void testHTTPSNoTrustEngine() throws Exception {
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL);
+ metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
metadataProvider.initialize();
@@ -185,10 +184,10 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
public void testHTTPSTrustEngineExplicitKey() throws Exception {
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL);
+ metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
- metadataProvider.setTLSTrustEngine(buildExplicitKeyTrustEngine("svn-entity.crt"));
+ metadataProvider.setTLSTrustEngine(buildExplicitKeyTrustEngine("repo-entity.crt"));
metadataProvider.initialize();
EntityDescriptor descriptor = metadataProvider.resolveSingle(criteriaSet);
@@ -201,7 +200,7 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
public void testHTTPSTrustEngineInvalidKey() throws Exception {
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL);
+ metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
metadataProvider.setTLSTrustEngine(buildExplicitKeyTrustEngine("badKey.crt"));
@@ -216,10 +215,10 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
public void testHTTPSTrustEngineValidPKIX() throws Exception {
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL);
+ metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
- metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("svn-rootCA.crt", null, false));
+ metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("repo-rootCA.crt", null, false));
metadataProvider.initialize();
EntityDescriptor descriptor = metadataProvider.resolveSingle(criteriaSet);
@@ -231,10 +230,10 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
public void testHTTPSTrustEngineValidPKIXExplicitName() throws Exception {
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL);
+ metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
- metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("svn-rootCA.crt", "*.shibboleth.net", true));
+ metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("repo-rootCA.crt", "*.shibboleth.net", true));
metadataProvider.initialize();
EntityDescriptor descriptor = metadataProvider.resolveSingle(criteriaSet);
@@ -246,7 +245,7 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
public void testHTTPSTrustEngineInvalidPKIX() throws Exception {
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL);
+ metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("badCA.crt", null, false));
@@ -261,10 +260,10 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
public void testHTTPSTrustEngineValidPKIXInvalidName() throws Exception {
httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
- metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL);
+ metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
- metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("svn-rootCA.crt", "foobar.shibboleth.net", true));
+ metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("repo-rootCA.crt", "foobar.shibboleth.net", true));
metadataProvider.initialize();
EntityDescriptor descriptor = metadataProvider.resolveSingle(criteriaSet);
@@ -275,10 +274,10 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
@Test(expectedExceptions=ComponentInitializationException.class)
public void testHTTPSTrustEngineWrongSocketFactory() throws Exception {
// Trust engine set, but appropriate socket factory not set
- metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL);
+ metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
- metadataProvider.setTLSTrustEngine(buildExplicitKeyTrustEngine("svn-entity.crt"));
+ metadataProvider.setTLSTrustEngine(buildExplicitKeyTrustEngine("repo-entity.crt"));
metadataProvider.initialize();
EntityDescriptor descriptor = metadataProvider.resolveSingle(criteriaSet);
diff --git a/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/repo-entity.crt b/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/repo-entity.crt
new file mode 100644
index 0000000..900b38f
--- /dev/null
+++ b/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/repo-entity.crt
@@ -0,0 +1,32 @@
+## This is the current *.shibboleth.net wildcard cert, expires Jan 2019.
+
+-----BEGIN CERTIFICATE-----
+MIIFDjCCA/agAwIBAgIUdnR7SqD521AChztho7tl+/HLFyMwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE3MDEwNDA5MTcy
+NFoXDTE5MDEwNDA5MTcyMVowgYwxCzAJBgNVBAYTAkdCMRAwDgYDVQQIEwdCcmlz
+dG9sMRAwDgYDVQQHEwdCcmlzdG9sMR4wHAYDVQQKExVKaXNjIFNlcnZpY2VzIExp
+bWl0ZWQxHjAcBgNVBAsTFVNoaWJib2xldGggQ29uc29ydGl1bTEZMBcGA1UEAwwQ
+Ki5zaGliYm9sZXRoLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AM6gYqSI4ZIF3aOKDjWGeNIE3gDpuBldu92YJSx9y02WJ51WAnf4z4i746/Zzs/M
+hJ9aiqr/jly2uJHuLRSMct8/BfeEuLkkt9G11QxhhmIlnsoS4a1LSPx7cj2Ga2bc
+EMHZZrOAPjOZdmQxoYImX8DXU/r9pJhM/OTKm6X/wX2dMEJpHdSv8jyjvBTc2MTL
+Tx2mSvGZxEJ4QWWgE/xHtNXsbbX60/mDdh9Ghok5k9gxwZwddhHALPmNgzjh0Bk0
+rNq2f/bhRKzm0ODXShXSMDYK1Ry5zy5VAXqBExthB5s35oXn2zHzKV0lFUHUIi9v
+tXxUzLDKpWUB5Bb6QPa+fKMCAwEAAaOCAaQwggGgMHMGCCsGAQUFBwEBBGcwZTAq
+BggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDcGCCsG
+AQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsZzIu
+Y3J0MCsGA1UdEQQkMCKCECouc2hpYmJvbGV0aC5uZXSCDnNoaWJib2xldGgubmV0
+MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEWKGh0dHA6
+Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0PAQH/BAQD
+AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSR
+GWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3Js
+LnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQUtblck29X
+TVA0UbqsT4WpABb4fqswDQYJKoZIhvcNAQELBQADggEBABhCGXmDsgxmVGNz9+Re
+b4HmQdXEU8BDgVbXgHLngjLRARKgfpFttfhvQ2fCDQSf5QGHe84JTH/9NicIj3Gb
+aMjHUU3t2zWjBCbL9zL6DUgmDliNLtXyKGgO1BqOj41jKory6l154lKf31EO/lB5
+E5cxMoE4qUohcdvnzYKauXr8GBc9By20eX5E+abzdn95ZuV0m+ZQyY5CW2sojIIk
+0grsnPFSIGgY7YWG0HkH4p/2WnMPXgsNpl41RNx/CKL3a6kWPgIpbunUCVEbLWCO
+Bgor2SHVd04AVV2ZMvqP1/fNvF7h4ouCTuyKsarED0ioj5KtTPMbH/EP6J2LEZV6
+x3w=
+-----END CERTIFICATE-----
diff --git a/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/svn-rootCA.crt b/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/repo-rootCA.crt
similarity index 100%
rename from opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/svn-rootCA.crt
rename to opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/repo-rootCA.crt
diff --git a/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/svn-entity.crt b/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/svn-entity.crt
deleted file mode 100644
index 53912ca..0000000
--- a/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/svn-entity.crt
+++ /dev/null
@@ -1,33 +0,0 @@
-## This is the current *.shibboleth.net wildcard cert, expires Jan 2017.
-
------BEGIN CERTIFICATE-----
-MIIFVTCCBD2gAwIBAgIRAKAUmlel82eQAKVyhh4ohcswDQYJKoZIhvcNAQELBQAw
-ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-IENBIDIwHhcNMTUwMTIyMDAwMDAwWhcNMTcwMTIxMjM1OTU5WjCB9zELMAkGA1UE
-BhMCR0IxETAPBgNVBBETCE9YMTEgMFNHMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEP
-MA0GA1UEBxMGRElEQ09UMRcwFQYDVQQJEw5IYXJ3ZWxsIE94Zm9yZDEXMBUGA1UE
-CRMOTGlicmFyeSBBdmVudWUxFDASBgNVBAkTC0x1bWVuIEhvdXNlMSswKQYDVQQK
-EyJKaXNjIENvbGxlY3Rpb25zIGFuZCBKYW5ldCBMaW1pdGVkMR4wHAYDVQQLExVT
-aGliYm9sZXRoIENvbnNvcnRpdW0xGTAXBgNVBAMUECouc2hpYmJvbGV0aC5uZXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOoGKkiOGSBd2jig41hnjS
-BN4A6bgZXbvdmCUsfctNliedVgJ3+M+Iu+Ov2c7PzISfWoqq/45ctriR7i0UjHLf
-PwX3hLi5JLfRtdUMYYZiJZ7KEuGtS0j8e3I9hmtm3BDB2WazgD4zmXZkMaGCJl/A
-11P6/aSYTPzkypul/8F9nTBCaR3Ur/I8o7wU3NjEy08dpkrxmcRCeEFloBP8R7TV
-7G21+tP5g3YfRoaJOZPYMcGcHXYRwCz5jYM44dAZNKzatn/24USs5tDg10oV0jA2
-CtUcuc8uVQF6gRMbYQebN+aF59sx8yldJRVB1CIvb7V8VMywyqVlAeQW+kD2vnyj
-AgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb4YYosP22vTAd
-BgNVHQ4EFgQUtblck29XTVA0UbqsT4WpABb4fqswDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
-IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
-KWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3JsMGwGCCsG
-AQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2VydHJ1c3QuY29t
-L1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3NwLnVzZXJ0
-cnVzdC5jb20wGwYDVR0RBBQwEoIQKi5zaGliYm9sZXRoLm5ldDANBgkqhkiG9w0B
-AQsFAAOCAQEASjrb5lvw6qJQ+ac2DZIl3KlMG59hiUqLDa1OrvWh//Y08dsZjT/S
-OG/5KQZPWAluxb4zbAnQgHIh4V9tyFl0MpDU0DcsO6DOnKHP7JkDKw+z0ljNdzAR
-l/SLivdSVDMVKNd5zyswmPYFAkLQWJvv/J2bXuKiFDaxPbQvMxiCHx9M3djCe29u
-3QJKmaD3Y1Dqjd4dXZRGLMYU+UYdZhRQRTpt0e/PvBzI5ZluJ+azaObttc1U/0i3
-v5RIWF+7zjSUubc10AkxxJrtcIiLHVOorNk4yLloKoeaNMHaBjpHkt2teMwTc8lB
-Lj4vIUsmIWLtnSJXv+14nGunVzXoYikI9w==
------END CERTIFICATE-----
diff --git a/opensaml-xmlsec-impl/pom.xml b/opensaml-xmlsec-impl/pom.xml
index 00332df..5c5756d 100644
--- a/opensaml-xmlsec-impl/pom.xml
+++ b/opensaml-xmlsec-impl/pom.xml
@@ -50,6 +50,13 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/DetachedSignatureTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/DetachedSignatureTest.java
index 92af5af..6de5d0c 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/DetachedSignatureTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/DetachedSignatureTest.java
@@ -17,16 +17,10 @@
package org.opensaml.xmlsec.signature.support;
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeMethod;
-import org.testng.Assert;
import java.security.KeyPair;
import javax.xml.bind.ValidationException;
-import net.shibboleth.utilities.java.support.xml.BasicParserPool;
-import net.shibboleth.utilities.java.support.xml.SerializeSupport;
-
import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
@@ -42,8 +36,15 @@ import org.opensaml.xmlsec.mock.SignableSimpleXMLObjectBuilder;
import org.opensaml.xmlsec.signature.Signature;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
import org.w3c.dom.Element;
+import net.shibboleth.utilities.java.support.repository.RepositorySupport;
+import net.shibboleth.utilities.java.support.xml.BasicParserPool;
+import net.shibboleth.utilities.java.support.xml.SerializeSupport;
+
public class DetachedSignatureTest extends XMLObjectBaseTestCase {
/** Class logger. */
@@ -134,7 +135,8 @@ public class DetachedSignatureTest extends XMLObjectBaseTestCase {
signature.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
signature.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA);
- String incommonMetadata = "http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/test/resources/org/opensaml/xmlsec/signature/support/InCommon-metadata.xml?content-type=text%2Fplain&view=co";
+ //Note: we have to use a http URL here, not https, as current default Santuario HTTP ResourceResolver doesn't support https URLs.
+ String incommonMetadata = (RepositorySupport.buildHTTPResourceURL("java-opensaml", "opensaml-xmlsec-impl/src/test/resources/org/opensaml/xmlsec/signature/support/InCommon-metadata.xml", false));
URIContentReference contentReference = new URIContentReference(incommonMetadata);
contentReference.getTransforms().add(SignatureConstants.TRANSFORM_C14N_EXCL_OMIT_COMMENTS);
contentReference.setDigestAlgorithm(SignatureConstants.ALGO_ID_DIGEST_SHA1);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list