Fixed ssl configuration for java 1.6

Marcus Linke · Marcus Linke · commit ef4e1978a1cd · 2014-10-24T23:37:00.000+02:00
diff --git a/src/main/java/com/github/dockerjava/core/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
@@ -1,11 +1,10 @@
 package com.github.dockerjava.core;
 
 import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
 import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+
 import java.security.KeyFactory;
 import java.security.KeyPair;
 import java.security.KeyStore;
@@ -30,8 +29,8 @@ public class CertificateUtils {
     public static boolean verifyCertificatesExist(String dockerCertPath) {
         String[] files = {"ca.pem", "cert.pem", "key.pem"};
         for (String file : files) {
-            Path path = Paths.get(dockerCertPath, file);
-            boolean exists = Files.exists(path);
+            File path = new File(dockerCertPath, file);
+            boolean exists = path.exists();
             if(!exists) {
                 return false;
             }
@@ -52,8 +51,8 @@ public static KeyStore createKeyStore(final String dockerCertPath) throws NoSuch
     }
     
     public static KeyStore createTrustStore(final String dockerCertPath) throws IOException, CertificateException, KeyStoreException, NoSuchAlgorithmException {
-        Path caPath = Paths.get(dockerCertPath, "ca.pem");
-        BufferedReader reader = Files.newBufferedReader(caPath, Charset.defaultCharset());
+        File caPath = new File(dockerCertPath, "ca.pem");
+        BufferedReader reader = new BufferedReader(new FileReader(caPath));
         PEMParser pemParser = null;
         
         try {
@@ -80,8 +79,8 @@ public static KeyStore createTrustStore(final String dockerCertPath) throws IOEx
     }
     
     private static Certificate loadCertificate(final String dockerCertPath) throws IOException, CertificateException {
-        Path certificate = Paths.get(dockerCertPath, "cert.pem");
-        BufferedReader reader = Files.newBufferedReader(certificate, Charset.defaultCharset());
+        File certificate = new File(dockerCertPath, "cert.pem");
+        BufferedReader reader = new BufferedReader(new FileReader(certificate));
         PEMParser pemParser = null;
         
         try {
@@ -102,8 +101,8 @@ private static Certificate loadCertificate(final String dockerCertPath) throws I
     }
     
     private static KeyPair loadPrivateKey(final String dockerCertPath) throws IOException, NoSuchAlgorithmException, InvalidKeySpecException {
-        Path certificate = Paths.get(dockerCertPath, "key.pem");
-        BufferedReader reader = Files.newBufferedReader(certificate, Charset.defaultCharset());
+        File certificate = new File(dockerCertPath, "key.pem");
+        BufferedReader reader = new BufferedReader(new FileReader(certificate));
 
         PEMParser pemParser = null;
         
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -112,17 +112,22 @@ public void init(DockerClientConfig dockerClientConfig) {
                     
                     Security.addProvider(new BouncyCastleProvider());
                     
-                    SslConfigurator sslConfig = SslConfigurator.newInstance();
-
                     KeyStore keyStore = CertificateUtils.createKeyStore(dockerCertPath);
                     KeyStore trustStore = CertificateUtils.createTrustStore(dockerCertPath);
-                                   
+                    
+                    // properties acrobatics not needed for java > 1.6
+                    String httpProtocols = System.getProperty("https.protocols");
+                    System.setProperty("https.protocols", "TLSv1");
+                    SslConfigurator sslConfig = SslConfigurator.newInstance(true);
+                    if(httpProtocols != null ) System.setProperty("https.protocols", httpProtocols);
+              
                     sslConfig.keyStore(keyStore);
                     sslConfig.keyStorePassword("docker");
-                    
                     sslConfig.trustStore(trustStore);
                     
                     SSLContext sslContext = sslConfig.createSSLContext();
+                    
+                    
                     clientBuilder.sslContext(sslContext);   
 
                 }
diff --git a/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java b/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java
@@ -23,7 +23,7 @@ public void fromString() {
 	}
 	
 	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "No enum constant.*")
+			expectedExceptionsMessageRegExp = "No enum const.*")
 	public void fromIllegalString() {
 		AccessMode.valueOf("xx");
 	}
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -67,6 +67,8 @@ public void testEventStreamTimeBound() throws InterruptedException, IOException
         boolean zeroCount = countDownLatch.await(5, TimeUnit.SECONDS);
 
         executorService.shutdown();
+        
+        
         assertTrue(zeroCount, "Expected 4 events, [create, start, die, stop]");
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
@@ -18,6 +18,7 @@
 
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.InternalServerErrorException;
+import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.client.AbstractDockerClientTest;
@@ -61,7 +62,13 @@ public void testPullImage() throws DockerException, IOException {
 		String testImage = "hackmann/empty";
 
 		LOG.info("Removing image: {}", testImage);
-		dockerClient.removeImageCmd(testImage).exec();
+		
+		try {
+			dockerClient.removeImageCmd(testImage).exec();
+		} catch (NotFoundException e) {
+			// just ignore if not exist
+		}
+		
 
 		info = dockerClient.infoCmd().exec();
 		LOG.info("Client info: {}", info.toString());
diff --git a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
@@ -17,6 +17,7 @@
 
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.InternalServerErrorException;
+import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
@@ -70,12 +71,10 @@ public void testWaitContainer() throws DockerException {
 	
 	@Test
 	public void testWaitNonExistingContainer() throws DockerException {
-		// docker returns InternalServerError instead of NotFound
-		// see https://github.com/docker/docker/issues/8107
 		try {
 			dockerClient.waitContainerCmd("non-existing").exec();
-			fail("expected InternalServerErrorException");
-		} catch (InternalServerErrorException e) {
+			fail("expected NotFoundException");
+		} catch (NotFoundException e) {
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public void fromString() {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`@Test(expectedExceptions = IllegalArgumentException.class,`
`26`		`- expectedExceptionsMessageRegExp = "No enum constant.*")`
	`26`	`+ expectedExceptionsMessageRegExp = "No enum const.*")`
`27`	`27`	`public void fromIllegalString() {`
`28`	`28`	`AccessMode.valueOf("xx");`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@ public void testEventStreamTimeBound() throws InterruptedException, IOException`
`67`	`67`	`boolean zeroCount = countDownLatch.await(5, TimeUnit.SECONDS);`
`68`	`68`
`69`	`69`	`executorService.shutdown();`
	`70`	`+`
	`71`	`+`
`70`	`72`	`assertTrue(zeroCount, "Expected 4 events, [create, start, die, stop]");`
`71`	`73`	`}`
`72`	`74`