Skip to content

Support for client certificate chains #1371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bsideup merged 5 commits into from
Jun 1, 2020
Merged

Support for client certificate chains #1371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed56bcd
Support for client certificate chains
silme Apr 20, 2020
154916b
Merge branch 'master' into master
bsideup May 23, 2020
b04ecdd
Merge branch 'master' into master
silme May 23, 2020
7e74727
Add test for client certificate chains
silme May 23, 2020
9d664f3
Merge branch 'master' into master
bsideup May 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions docker-java-core/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,13 @@ public static List<Certificate> loadCertificates(final Reader reader) throws IOE

JcaX509CertificateConverter certificateConverter = new JcaX509CertificateConverter()
.setProvider(BouncyCastleProvider.PROVIDER_NAME);
Object certObj = pemParser.readObject();
Object certObj;

if (certObj instanceof X509CertificateHolder) {
X509CertificateHolder certificateHolder = (X509CertificateHolder) certObj;
certificates.add(certificateConverter.getCertificate(certificateHolder));
while ((certObj = pemParser.readObject()) != null) {
if (certObj instanceof X509CertificateHolder) {
X509CertificateHolder certificateHolder = (X509CertificateHolder) certObj;
certificates.add(certificateConverter.getCertificate(certificateHolder));
}
}

return certificates;
Expand Down
16 changes: 16 additions & 0 deletions docker-java/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import java.nio.file.Paths;
import java.security.KeyStore;
import java.security.Security;
import java.security.cert.Certificate;
import java.util.List;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
Expand Down Expand Up @@ -86,6 +88,20 @@ public void readMultipleCaCerts() throws Exception {
assertThat(keyStore.isCertificateEntry("ca-2"), is(true));
}

@Test
public void readCert() throws Exception {
String certpem = readFileAsString("caTest/single_ca.pem");
List<Certificate> certs = CertificateUtils.loadCertificates(certpem);
assertThat(certs.size(), is(1));
}

@Test
public void readMultipleCerts() throws Exception {
String certpem = readFileAsString("caTest/multiple_ca.pem");
List<Certificate> certs = CertificateUtils.loadCertificates(certpem);
assertThat(certs.size(), is(2));
}

private String readFileAsString(String path) throws IOException {
return new String(Files.readAllBytes(Paths.get(new File(baseDir + path).getPath())));
}
Expand Down