Skip to content

Fix for Issue #294 - Support certificate chains in cert.pem #295

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
marcuslinke merged 1 commit into from
Aug 14, 2015
Merged

Fix for Issue #294 - Support certificate chains in cert.pem #295

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 23 additions & 11 deletions src/main/java/com/github/dockerjava/core/CertificateUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
package com.github.dockerjava.core;

import org.apache.commons.io.IOUtils;
import org.bouncycastle.cert.X509CertificateHolder;
import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
import org.bouncycastle.openssl.PEMKeyPair;
import org.bouncycastle.openssl.PEMParser;

import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
Expand All @@ -16,12 +22,8 @@
import java.security.spec.InvalidKeySpecException;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;

import org.apache.commons.io.IOUtils;
import org.bouncycastle.cert.X509CertificateHolder;
import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
import org.bouncycastle.openssl.PEMKeyPair;
import org.bouncycastle.openssl.PEMParser;
import java.util.ArrayList;
import java.util.List;

public class CertificateUtils {

Expand All @@ -41,13 +43,13 @@ public static boolean verifyCertificatesExist(String dockerCertPath) {
public static KeyStore createKeyStore(final String dockerCertPath) throws NoSuchAlgorithmException,
InvalidKeySpecException, IOException, CertificateException, KeyStoreException {
KeyPair keyPair = loadPrivateKey(dockerCertPath);
Certificate privateCertificate = loadCertificate(dockerCertPath);
List<Certificate> privateCertificates = loadCertificates(dockerCertPath);

KeyStore keyStore = KeyStore.getInstance("JKS");
keyStore.load(null);

keyStore.setKeyEntry("docker", keyPair.getPrivate(), "docker".toCharArray(),
new Certificate[] { privateCertificate });
privateCertificates.toArray(new Certificate[privateCertificates.size()]) );
return keyStore;
}

Expand Down Expand Up @@ -80,15 +82,25 @@ public static KeyStore createTrustStore(final String dockerCertPath) throws IOEx

}

private static Certificate loadCertificate(final String dockerCertPath) throws IOException, CertificateException {
private static List<Certificate> loadCertificates(final String dockerCertPath) throws IOException, CertificateException {
File certificate = new File(dockerCertPath, "cert.pem");
BufferedReader reader = new BufferedReader(new FileReader(certificate));
PEMParser pemParser = null;

try {
List<Certificate> certificates = new ArrayList<>();
pemParser = new PEMParser(reader);
X509CertificateHolder certificateHolder = (X509CertificateHolder) pemParser.readObject();
return new JcaX509CertificateConverter().setProvider("BC").getCertificate(certificateHolder);
JcaX509CertificateConverter certificateConverter = new JcaX509CertificateConverter().setProvider("BC");
Object certObj = pemParser.readObject();

while (certObj != null) {
X509CertificateHolder certificateHolder = (X509CertificateHolder) certObj;
certificates.add(certificateConverter.getCertificate(certificateHolder));

certObj = pemParser.readObject();
}

return certificates;
} finally {
if (pemParser != null) {
IOUtils.closeQuietly(pemParser);
Expand Down