Repository: jclouds-labs Updated Branches: refs/heads/1.9.x 42d2352c3 -> 73920578b
Fix incorrect key format check in Docker Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/73920578 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/73920578 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/73920578 Branch: refs/heads/1.9.x Commit: 73920578b8b81f85304e9f4035c6f7035c57780b Parents: 42d2352 Author: Andrew Donald Kennedy <[email protected]> Authored: Thu Jun 16 20:02:14 2016 +0100 Committer: Ignasi Barrera <[email protected]> Committed: Fri Jun 17 00:08:22 2016 +0200 ---------------------------------------------------------------------- .../DockerUntrustedSSLContextSupplier.java | 21 ++++++++++---------- .../docker/suppliers/SSLContextBuilder.java | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/73920578/docker/src/main/java/org/jclouds/docker/suppliers/DockerUntrustedSSLContextSupplier.java ---------------------------------------------------------------------- diff --git a/docker/src/main/java/org/jclouds/docker/suppliers/DockerUntrustedSSLContextSupplier.java b/docker/src/main/java/org/jclouds/docker/suppliers/DockerUntrustedSSLContextSupplier.java index 0480f13..ab71391 100644 --- a/docker/src/main/java/org/jclouds/docker/suppliers/DockerUntrustedSSLContextSupplier.java +++ b/docker/src/main/java/org/jclouds/docker/suppliers/DockerUntrustedSSLContextSupplier.java @@ -16,22 +16,23 @@ */ package org.jclouds.docker.suppliers; -import com.google.common.base.Supplier; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Throwables.propagate; +import static org.jclouds.docker.suppliers.SSLContextBuilder.isClientKeyAndCertificateData; -import org.jclouds.domain.Credentials; -import org.jclouds.http.config.SSLModule; -import org.jclouds.location.Provider; +import java.io.File; +import java.io.IOException; +import java.security.GeneralSecurityException; import javax.inject.Inject; import javax.inject.Singleton; import javax.net.ssl.SSLContext; -import java.io.IOException; -import java.security.GeneralSecurityException; +import com.google.common.base.Supplier; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Throwables.propagate; -import static org.jclouds.docker.suppliers.SSLContextBuilder.isClientKeyAndCertificateData; +import org.jclouds.domain.Credentials; +import org.jclouds.http.config.SSLModule; +import org.jclouds.location.Provider; @Singleton public class DockerUntrustedSSLContextSupplier implements Supplier<SSLContext> { @@ -52,7 +53,7 @@ public class DockerUntrustedSSLContextSupplier implements Supplier<SSLContext> { SSLContextBuilder builder = new SSLContextBuilder(); if (isClientKeyAndCertificateData(currentCreds.credential, currentCreds.identity)) { builder.clientKeyAndCertificateData(currentCreds.credential, currentCreds.identity); - } else { + } else if (new File(currentCreds.identity).isFile() && new File(currentCreds.credential).isFile()) { builder.clientKeyAndCertificatePaths(currentCreds.credential, currentCreds.identity); } builder.trustManager(insecureTrustManager); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/73920578/docker/src/main/java/org/jclouds/docker/suppliers/SSLContextBuilder.java ---------------------------------------------------------------------- diff --git a/docker/src/main/java/org/jclouds/docker/suppliers/SSLContextBuilder.java b/docker/src/main/java/org/jclouds/docker/suppliers/SSLContextBuilder.java index cc1025b..2933f78 100644 --- a/docker/src/main/java/org/jclouds/docker/suppliers/SSLContextBuilder.java +++ b/docker/src/main/java/org/jclouds/docker/suppliers/SSLContextBuilder.java @@ -59,7 +59,7 @@ public class SSLContextBuilder { private TrustManager[] trustManagers; public static final boolean isClientKeyAndCertificateData(String key, String cert) { - return (key.startsWith(Pems.PUBLIC_X509_MARKER) || key.startsWith(Pems.PUBLIC_PKCS1_MARKER)) && + return (key.startsWith(Pems.PRIVATE_PKCS1_MARKER) || key.startsWith(Pems.PRIVATE_PKCS8_MARKER)) && cert.startsWith(Pems.CERTIFICATE_X509_MARKER); }
