From edd0c747cfbb91a3a2349e58b4d5964d0c84a7d5 Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Fri, 8 Sep 2023 13:47:24 +0200 Subject: [PATCH] RED-7572 - Change privateKey to base64EncodedPrivateKey for DigitalSignature... --- .../api/impl/controller/DigitalSignatureController.java | 7 +++---- .../v1/server/integration/tests/DigitalSignatureTest.java | 2 +- .../dossiertemplate/configuration/DigitalSignature.java | 4 +++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DigitalSignatureController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DigitalSignatureController.java index 69fdf691b..631e592c5 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DigitalSignatureController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DigitalSignatureController.java @@ -3,14 +3,12 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_DIGITAL_SIGNATURE; import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.WRITE_DIGITAL_SIGNATURE; -import java.nio.charset.StandardCharsets; +import java.util.Base64; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.util.Base64Utils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity; import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.DigitalSignatureEntity; import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.DigitalSignatureKmsEntity; import com.iqser.red.service.persistence.management.v1.processor.service.DigitalSignatureKmsService; @@ -25,6 +23,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.DigitalSign import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditRequest; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.DigitalSignature; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.DigitalSignatureType; +import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity; import lombok.RequiredArgsConstructor; @@ -192,7 +191,7 @@ public class DigitalSignatureController implements DigitalSignatureResource { .location(digitalSignature.getLocation()) .password(digitalSignature.getPassword()) .reason(digitalSignature.getReason()) - .privateKey(Base64Utils.decodeFromString(digitalSignature.getPrivateKey())) + .privateKey(Base64.getDecoder().decode(digitalSignature.getBase64EncodedPrivateKey())) .build(); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DigitalSignatureTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DigitalSignatureTest.java index ff12f12d2..a50495569 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DigitalSignatureTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DigitalSignatureTest.java @@ -41,7 +41,7 @@ public class DigitalSignatureTest extends AbstractPersistenceServerServiceTest { digitalSignature.setReason("test"); digitalSignature.setLocation("test"); digitalSignature.setContactInfo("test"); - digitalSignature.setPrivateKey("zzz"); + digitalSignature.setBase64EncodedPrivateKey("zzz"); var savedDigitalSignature = digitalSignatureClient.saveDigitalSignature(digitalSignature); diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/configuration/DigitalSignature.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/configuration/DigitalSignature.java index c46079677..22bf29125 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/configuration/DigitalSignature.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/configuration/DigitalSignature.java @@ -4,11 +4,13 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.ToString; @Data @Builder @NoArgsConstructor @AllArgsConstructor +@ToString public class DigitalSignature { private String id; @@ -17,6 +19,6 @@ public class DigitalSignature { private String contactInfo; private String certificateName; private String password; - private String privateKey; + private String base64EncodedPrivateKey; }