[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl: FileBacke...

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Feb 26 18:25:49 2015
New Revision: 4241

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4241&view=rev
Log:
Update HTTP metadata provider TLS trust engine tests to be more realistic and disable trust engine-level name checking.

Modified:
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java?rev=4241&r1=4240&r2=4241&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java Thu Feb 26 18:25:49 2015
@@ -22,6 +22,7 @@
 import java.security.cert.CertificateException;
 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;
@@ -43,6 +44,8 @@
 import org.opensaml.security.x509.X509Credential;
 import org.opensaml.security.x509.X509Support;
 import org.opensaml.security.x509.impl.BasicPKIXValidationInformation;
+import org.opensaml.security.x509.impl.BasicX509CredentialNameEvaluator;
+import org.opensaml.security.x509.impl.CertPathPKIXTrustEvaluator;
 import org.opensaml.security.x509.impl.PKIXX509CredentialTrustEngine;
 import org.opensaml.security.x509.impl.StaticPKIXValidationInformationResolver;
 import org.testng.Assert;
@@ -308,7 +311,22 @@
         metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL, backupFilePath);
         metadataProvider.setParserPool(parserPool);
         metadataProvider.setId("test");
-        metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("svn-rootCA.crt", "*.shibboleth.net"));
+        metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("svn-rootCA.crt", null, false));
+        metadataProvider.initialize();
+        
+        EntityDescriptor descriptor = metadataProvider.resolveSingle(criteriaSet);
+        Assert.assertNotNull(descriptor, "Retrieved entity descriptor was null");
+        Assert.assertEquals(descriptor.getEntityID(), entityID, "Entity's ID does not match requested ID");
+    }
+    
+    @Test
+    public void testHTTPSTrustEngineValidPKIXExplicitName() throws Exception  {
+        httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
+        
+        metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL, backupFilePath);
+        metadataProvider.setParserPool(parserPool);
+        metadataProvider.setId("test");
+        metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("svn-rootCA.crt", "*.shibboleth.net", true));
         metadataProvider.initialize();
         
         EntityDescriptor descriptor = metadataProvider.resolveSingle(criteriaSet);
@@ -323,7 +341,7 @@
         metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL, backupFilePath);
         metadataProvider.setParserPool(parserPool);
         metadataProvider.setId("test");
-        metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("badCA.crt", "*.shibboleth.net"));
+        metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("badCA.crt", null, false));
         metadataProvider.initialize();
         
         EntityDescriptor descriptor = metadataProvider.resolveSingle(criteriaSet);
@@ -338,7 +356,7 @@
         metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), httpsMDURL, backupFilePath);
         metadataProvider.setParserPool(parserPool);
         metadataProvider.setId("test");
-        metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("svn-rootCA.crt", "foobar.shibboleth.net"));
+        metadataProvider.setTLSTrustEngine(buildPKIXTrustEngine("svn-rootCA.crt", "foobar.shibboleth.net", true));
         metadataProvider.initialize();
         
         EntityDescriptor descriptor = metadataProvider.resolveSingle(criteriaSet);
@@ -377,12 +395,15 @@
         return new ExplicitKeyTrustEngine(new StaticCredentialResolver(entityCredential));
     }
     
-    private TrustEngine<? super X509Credential> buildPKIXTrustEngine(String cert, String name) throws URISyntaxException, CertificateException {

[... 196 lines stripped ...]