Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-7572 - Change privateKey to base64EncodedPrivateKey for DigitalSignature...

Browse Source
This commit is contained in:
Andrei Isvoran 2023-09-08 13:47:24 +02:00
parent be3d717079
commit edd0c747cf
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DigitalSignatureController.java vendored
View File

@ -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();
}

2
persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DigitalSignatureTest.java
View File

@ -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);

4
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
View File

@ -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;
}