Changed withSecure to withCertificateVerification. Also adjusted the …

…structure of the certificate verification code so that it is easier to reason about when first looking at it.
SpectraLogic · Oct 13, 2014 · bc2f40a · bc2f40a
1 parent 87d0931
commit bc2f40a
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 32 deletions.
diff --git a/integration/src/main/java/com/spectralogic/ds3client/integration/Util.java b/integration/src/main/java/com/spectralogic/ds3client/integration/Util.java
@@ -29,7 +29,7 @@ public static Ds3Client fromEnv() {
 
     public static Ds3Client insecureFromEnv() {
         final Ds3ClientBuilder builder = clientBuilder();
-        builder.withSecure(false);
+        builder.withCertificateVerification(false);
         return builder.build();
     }
 

diff --git a/sdk/src/main/java/com/spectralogic/ds3client/ConnectionDetailsImpl.java b/sdk/src/main/java/com/spectralogic/ds3client/ConnectionDetailsImpl.java
@@ -29,7 +29,7 @@ static class Builder implements com.spectralogic.ds3client.utils.Builder<Connect
         private URI proxy = null;
         private int retries = 5;
         private int bufferSize = 1024 * 1024;
-        private boolean secure;
+        private boolean certificateVerification;
 
         private Builder(final String endpoint, final Credentials credentials) {
             this.endpoint = endpoint;
@@ -56,8 +56,8 @@ public Builder withBufferSize(final int bufferSize) {
             return this;
         }
 
-        public Builder withSecure(final boolean secure) {
-            this.secure = secure;
+        public Builder withCertificateVerification(final boolean certificateVerification) {
+            this.certificateVerification = certificateVerification;
             return this;
         }
 
@@ -74,7 +74,7 @@ public ConnectionDetailsImpl build() {
     private final URI proxy;
     private final int retries;
     private final int bufferSize;
-    private final boolean secure;
+    private final boolean certificateVerification;
 
     static Builder builder(final String uriEndpoint, final Credentials credentials) {
         return new Builder(uriEndpoint, credentials);
@@ -87,7 +87,7 @@ private ConnectionDetailsImpl(final Builder builder) {
         this.proxy = builder.proxy;
         this.retries = builder.retries;
         this.bufferSize = builder.bufferSize;
-        this.secure = builder.secure;
+        this.certificateVerification = builder.certificateVerification;
     }
 
     @Override
@@ -121,8 +121,8 @@ public int getBufferSize() {
     }
 
     @Override
-    public boolean isSecure() {
-        return secure;
+    public boolean isCertificateVerification() {
+        return certificateVerification;
     }
 
 }
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/Ds3ClientBuilder.java b/sdk/src/main/java/com/spectralogic/ds3client/Ds3ClientBuilder.java
@@ -19,7 +19,7 @@ public class Ds3ClientBuilder implements Builder<Ds3Client> {
     final private Credentials credentials;
 
     private boolean https = true;
-    private boolean secure = true;
+    private boolean certificateVerification = true;
     private URI proxy = null;
     private int retries = 5;
     private int bufferSize = 1024 * 1024;
@@ -67,8 +67,8 @@ public Ds3ClientBuilder withBufferSize(final int bufferSize) {
     /**
      * Specifies if the library should perform SSL certificate validation.
      */
-    public Ds3ClientBuilder withSecure(final boolean secure) {
-        this.secure = secure;
+    public Ds3ClientBuilder withCertificateVerification(final boolean certificateVerification) {
+        this.certificateVerification = certificateVerification;
         return this;
     }
 
@@ -111,7 +111,7 @@ public Ds3ClientBuilder withRedirectRetries(final int retries) {
     @Override
     public Ds3Client build() {
         final ConnectionDetailsImpl.Builder connBuilder = ConnectionDetailsImpl.builder(this.endpoint, this.credentials)
-            .withProxy(this.proxy).withHttps(this.https).withSecure(this.secure).withRedirectRetries(this.retries).withBufferSize(this.bufferSize);
+            .withProxy(this.proxy).withHttps(this.https).withCertificateVerification(this.certificateVerification).withRedirectRetries(this.retries).withBufferSize(this.bufferSize);
 
         final NetworkClient netClient = new NetworkClientImpl(connBuilder.build());
         return new Ds3ClientImpl(netClient);

diff --git a/sdk/src/main/java/com/spectralogic/ds3client/NetworkClientImpl.java b/sdk/src/main/java/com/spectralogic/ds3client/NetworkClientImpl.java
@@ -120,25 +120,26 @@ private HttpHost buildHost() throws MalformedURLException {
         }
 
         private CloseableHttpClient getClient() {
-            if (!NetworkClientImpl.this.getConnectionDetails().isHttps()) {
-                return HttpClients.createDefault();
+            if (NetworkClientImpl.this.getConnectionDetails().isHttps() && !NetworkClientImpl.this.getConnectionDetails().isCertificateVerification()) {
+                try {
+
+                    final SSLContext sslContext = SSLContexts.custom().loadTrustMaterial(null, new TrustStrategy() {
+                        @Override
+                        public boolean isTrusted(final X509Certificate[] chain, final String authType) throws CertificateException {
+                            return true;
+                        }
+                    }).useTLS().build();
+
+                    final SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, new AllowAllHostnameVerifier());
+                    return HttpClients.custom().setSSLSocketFactory(
+                            sslsf).build();
+
+                } catch (final NoSuchAlgorithmException | KeyStoreException | KeyManagementException e) {
+                    throw new SSLSetupException(e);
+                }
             }
-
-            try {
-
-                final SSLContext sslContext = SSLContexts.custom().loadTrustMaterial(null, new TrustStrategy() {
-                    @Override
-                    public boolean isTrusted(final X509Certificate[] chain, final String authType) throws CertificateException {
-                        return true;
-                    }
-                }).useTLS().build();
-
-                final SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, new AllowAllHostnameVerifier());
-                return HttpClients.custom().setSSLSocketFactory(
-                        sslsf).build();
-
-            } catch (final NoSuchAlgorithmException | KeyStoreException | KeyManagementException e) {
-                throw new SSLSetupException(e);
+            else {
+                return HttpClients.createDefault();
             }
         }
 

diff --git a/sdk/src/main/java/com/spectralogic/ds3client/networking/ConnectionDetails.java b/sdk/src/main/java/com/spectralogic/ds3client/networking/ConnectionDetails.java
@@ -40,5 +40,5 @@ public interface ConnectionDetails {
      * Returns true if the network layer should perform certificate authentication for SSL.  False will disable
      * certificate authentication.
      */
-    boolean isSecure();
+    boolean isCertificateVerification();
 }
diff --git a/sdk/src/test/java/com/spectralogic/ds3client/helpers/Ds3ClientHelpers_Test.java b/sdk/src/test/java/com/spectralogic/ds3client/helpers/Ds3ClientHelpers_Test.java
@@ -118,7 +118,6 @@ public SeekableByteChannel buildChannel(final String key) throws IOException {
                 return new ByteArraySeekableByteChannel();
             }
         });
-        Assert.fail("Should have failed with an exception before we got here.");
     }
 
     @Test
-Original file line number
+Diff line change
@@ Expand Up @@
                     return new ByteArraySeekableByteChannel();
                 }
             });
-            Assert.fail("Should have failed with an exception before we got here.");
         }
         @Test
@@ Expand Down @@