Skip to content

Fix of getting client keystore without private pem. #54006

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
mposolda merged 1 commit into from
Oct 20, 2026
Merged

Fix of getting client keystore without private pem. #54006

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
11 changes: 3 additions & 8 deletions ...c/main/java/org/keycloak/services/resources/admin/ClientAttributeCertificateResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ private void updateCertFromRequest(CertificateRepresentation info) {
}

/**
* Get a keystore file for the client, containing private key and public certificate
* Get a keystore file for the client, containing the public certificate
*
* @param config Keystore configuration as JSON
* @return
Expand All @@ -230,21 +230,16 @@ public byte[] getKeystore(@Parameter(description = "Keystore configuration as JS
checkKeystoreFormat(config);

CertificateRepresentation info = CertificateInfoHelper.getCertificateFromClient(client, attributePrefix, session.getKeycloakSessionFactory());
String privatePem = info.getPrivateKey();
String certPem = info.getCertificate();

if (privatePem == null && certPem == null) {
if (certPem == null) {
throw new NotFoundException("keypair not generated for client");
}
if (privatePem != null && config.getKeyPassword() == null) {
throw new ErrorResponseException("password-missing", "Need to specify a key password for jks download", Response.Status.BAD_REQUEST);
}
if (config.getStorePassword() == null) {
throw new ErrorResponseException("password-missing", "Need to specify a store password for jks download", Response.Status.BAD_REQUEST);
}

byte[] rtn = getKeystore(config, privatePem, certPem);
return rtn;
return getKeystore(config, null, certPem);
}

/**
Expand Down
Loading