Skip to content

Commit 1576aad

Browse files
Hendrik-HKostyaSha
authored andcommitted
Fixed verifyCertificatesExist for missing or wrong files.
1 parent cdc17cb commit 1576aad

File tree

14 files changed

+54
-2
lines changed

14 files changed

+54
-2
lines changed

src/main/java/com/github/dockerjava/core/util/CertificateUtils.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ private CertificateUtils() {
3232

3333
public static boolean verifyCertificatesExist(String dockerCertPath) {
3434
String[] files = {"ca.pem", "cert.pem", "key.pem"};
35+
boolean result = true;
3536
for (String file : files) {
3637
File path = new File(dockerCertPath, file);
37-
return path.exists();
38+
result &= path.exists();
3839
}
3940

40-
return true;
41+
return result;
4142
}
4243

4344
public static KeyStore createKeyStore(final String dockerCertPath) throws NoSuchAlgorithmException,
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package com.github.dockerjava.core.util;
2+
3+
import org.testng.annotations.Test;
4+
5+
import static org.hamcrest.MatcherAssert.assertThat;
6+
import static org.hamcrest.core.Is.is;
7+
8+
public class CertificateUtilsTest {
9+
private static final String baseDir = CertificateUtilsTest.class.getResource(
10+
CertificateUtilsTest.class.getSimpleName() + "/").getFile();
11+
12+
@Test
13+
public void allFilesExist() {
14+
assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "allFilesExist"), is(true));
15+
}
16+
17+
@Test
18+
public void caAndCertAndKeyMissing() {
19+
assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "caAndCertAndKeyMissing"), is(false));
20+
}
21+
22+
@Test
23+
public void caAndCertMissing() {
24+
assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "caAndCertMissing"), is(false));
25+
}
26+
27+
@Test
28+
public void caAndKeyMissing() {
29+
assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "caAndKeyMissing"), is(false));
30+
}
31+
32+
@Test
33+
public void caMissing() {
34+
assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "caMissing"), is(false));
35+
}
36+
37+
@Test
38+
public void certAndKeyMissing() {
39+
assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "certAndKeyMissing"), is(false));
40+
}
41+
42+
@Test
43+
public void certMissing() {
44+
assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "certMissing"), is(false));
45+
}
46+
47+
@Test
48+
public void keyMissing() {
49+
assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "keyMissing"), is(false));
50+
}
51+
}

src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/ca.pem

Whitespace-only changes.

src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/cert.pem

Whitespace-only changes.

src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/key.pem

Whitespace-only changes.

src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndCertMissing/key.pem

Whitespace-only changes.

src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndKeyMissing/cert.pem

Whitespace-only changes.

src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/cert.pem

Whitespace-only changes.

src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/key.pem

Whitespace-only changes.

src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certAndKeyMissing/ca.pem

Whitespace-only changes.

0 commit comments

Comments
 (0)