Fix load certs from file system

Marcus Linke · Marcus Linke · commit 63f276a99c0f · 2016-06-07T23:36:25.000+02:00
diff --git a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
@@ -2,7 +2,10 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.io.File;
 import java.io.Serializable;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.security.Security;
 
 import javax.net.ssl.SSLContext;
@@ -50,9 +53,17 @@ public SSLContext getSSLContext() {
                     System.setProperty("https.protocols", httpProtocols);
                 }
 
-                sslConfig.keyStore(CertificateUtils.createKeyStore(dockerCertPath));
+                String caPemPath = dockerCertPath + File.separator + "ca.pem";
+                String keyPemPath = dockerCertPath + File.separator + "key.pem";
+                String certPemPath = dockerCertPath + File.separator + "cert.pem";
+
+                String keypem = new String(Files.readAllBytes(Paths.get(keyPemPath)));
+                String certpem = new String(Files.readAllBytes(Paths.get(certPemPath)));
+                String capem = new String(Files.readAllBytes(Paths.get(caPemPath)));
+
+                sslConfig.keyStore(CertificateUtils.createKeyStore(keypem, certpem));
                 sslConfig.keyStorePassword("docker");
-                sslConfig.trustStore(CertificateUtils.createTrustStore(dockerCertPath));
+                sslConfig.trustStore(CertificateUtils.createTrustStore(capem));
 
                 return sslConfig.createSSLContext();
 
diff --git a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
@@ -18,6 +18,7 @@
 import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.cert.X509CertificateHolder;
@@ -49,15 +50,6 @@ public static boolean verifyCertificatesExist(String dockerCertPath) {
         return result;
     }
 
-    /**
-     * @param dockerCertPath with standard named files.
-     */
-    public static KeyStore createKeyStore(final String dockerCertPath) throws NoSuchAlgorithmException,
-            InvalidKeySpecException, IOException, CertificateException, KeyStoreException {
-        return createKeyStore("key.pem", "cert.pem");
-    }
-
-
     @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
     public static KeyStore createKeyStore(final String keypem, final String certpem) throws NoSuchAlgorithmException,
             InvalidKeySpecException, IOException, CertificateException, KeyStoreException {
