From 84e120d11177d3aa24e6a125fe1b673d7c97c768 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 17 May 2022 16:26:49 +0200 Subject: [PATCH] Polishing. Correctly propagate certificate format. See gh-688 --- .../org/springframework/vault/core/VaultPkiTemplate.java | 9 +++++++++ .../vault/core/VaultPkiTemplateIntegrationTests.java | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiTemplate.java index 16488a28..a9d63a31 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiTemplate.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiTemplate.java @@ -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; } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultPkiTemplateIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultPkiTemplateIntegrationTests.java index 98fd17a4..76ea118b 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultPkiTemplateIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultPkiTemplateIntegrationTests.java @@ -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