Spring/spring-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Correctly propagate certificate format.

See gh-688
This commit is contained in:
Mark Paluch
2022-05-17 16:26:49 +02:00
parent 978cf7bd78
commit 84e120d111
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiTemplate.java
View File

@@ -181,6 +181,15 @@ public class VaultPkiTemplate implements VaultPkiOperations {
if (certificateRequest.isExcludeCommonNameFromSubjectAltNames()) {
request.put("exclude_cn_from_sans", true);
}
if (StringUtils.hasText(certificateRequest.getFormat())) {
request.put("format", certificateRequest.getFormat());
}
if (StringUtils.hasText(certificateRequest.getPrivateKeyFormat())) {
request.put("private_key_format", certificateRequest.getPrivateKeyFormat());
}
return request;
}

4
spring-vault-core/src/test/java/org/springframework/vault/core/VaultPkiTemplateIntegrationTests.java
View File

@@ -159,7 +159,9 @@ class VaultPkiTemplateIntegrationTests extends IntegrationTestSupport {
void issueCertificateUsingFormat(KeyFixture keyFixture) throws Exception {
VaultCertificateRequest request = VaultCertificateRequest.builder()
.commonName(keyFixture.format.replace('_', '-') + ".hello.example.com").format(keyFixture.format)
.commonName(keyFixture.format.replace('_', '-') + ".hello.example.com")
.privateKeyFormat(keyFixture.privateKeyFormat)
.format(keyFixture.format)
.build();
VaultCertificateResponse certificateResponse = this.pkiOperations