Skip to content

support certificate chain when reading client certificate(s) #2009

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
merged 1 commit into from
Dec 1, 2021
Merged

support certificate chain when reading client certificate(s) #2009

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
10 changes: 7 additions & 3 deletions util/src/main/java/io/kubernetes/client/util/SSLUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@
import java.security.PrivateKey;
import java.security.Security;
import java.security.UnrecoverableKeyException;
import java.security.cert.Certificate;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.RSAPrivateCrtKeySpec;
import java.util.Collection;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
import org.apache.commons.codec.binary.Base64;
Expand Down Expand Up @@ -175,7 +177,7 @@ public static KeyStore createKeyStore(
throws IOException, CertificateException, NoSuchAlgorithmException, InvalidKeySpecException,
KeyStoreException {
CertificateFactory certFactory = CertificateFactory.getInstance("X509");
X509Certificate cert = (X509Certificate) certFactory.generateCertificate(certInputStream);
Collection<? extends Certificate> certs = certFactory.generateCertificates(certInputStream);

PrivateKey privateKey = loadKey(keyInputStream, clientKeyAlgo);

Expand All @@ -195,8 +197,10 @@ public static KeyStore createKeyStore(
loadDefaultKeyStoreFile(keyStore, keyStorePassphrase);
}

String alias = cert.getSubjectX500Principal().getName();
keyStore.setKeyEntry(alias, privateKey, clientKeyPassphrase, new X509Certificate[] {cert});
String alias =
((X509Certificate) certs.stream().findFirst().get()).getSubjectX500Principal().getName();
keyStore.setKeyEntry(
alias, privateKey, clientKeyPassphrase, certs.toArray(new X509Certificate[certs.size()]));

return keyStore;
}
Expand Down