From 7f1db2e8dd252129165af5738c7197b36fce93be Mon Sep 17 00:00:00 2001 From: bergmann-dierk <84856774+bergmann-dierk@users.noreply.github.com> Date: Mon, 21 Mar 2022 10:12:10 +0100 Subject: [PATCH] fix return value for cms migration of signer information (#165) Co-authored-by: Felix Dittrich <31076102+f11h@users.noreply.github.com> --- .../dgc/gateway/service/SignerInformationService.java | 2 +- .../CertificateMigrationControllerTest.java | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/eu/europa/ec/dgc/gateway/service/SignerInformationService.java b/src/main/java/eu/europa/ec/dgc/gateway/service/SignerInformationService.java index f033d5e6..3353a40b 100644 --- a/src/main/java/eu/europa/ec/dgc/gateway/service/SignerInformationService.java +++ b/src/main/java/eu/europa/ec/dgc/gateway/service/SignerInformationService.java @@ -226,7 +226,7 @@ public List getCmsPackage(String country) { return signerInformationRepository .getByCertificateTypeAndCountry(SignerInformationEntity.CertificateType.DSC, country) .stream() - .map(it -> new CmsPackageDto(it.getRawData(), it.getId(), CmsPackageDto.CmsPackageTypeDto.DSC)) + .map(it -> new CmsPackageDto(it.getSignature(), it.getId(), CmsPackageDto.CmsPackageTypeDto.DSC)) .collect(Collectors.toList()); } diff --git a/src/test/java/eu/europa/ec/dgc/gateway/restapi/controller/CertificateMigrationControllerTest.java b/src/test/java/eu/europa/ec/dgc/gateway/restapi/controller/CertificateMigrationControllerTest.java index acbb1034..4720579b 100644 --- a/src/test/java/eu/europa/ec/dgc/gateway/restapi/controller/CertificateMigrationControllerTest.java +++ b/src/test/java/eu/europa/ec/dgc/gateway/restapi/controller/CertificateMigrationControllerTest.java @@ -122,7 +122,7 @@ void testAllCertTypes() throws Exception { X509Certificate certDscEu = CertificateTestUtils.generateCertificate(keyPairGenerator.generateKeyPair(), countryCode, "Test"); String cmsBase64 = Base64.getEncoder().encodeToString(certDscEu.getEncoded()); - createSignerInfo(cmsBase64, certDscEu); + createSignerInfo(cmsBase64, certDscEu, "signature1"); createRevocation(cmsBase64); createValidationEntry(cmsBase64); @@ -133,8 +133,11 @@ void testAllCertTypes() throws Exception { .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)) .andExpect(jsonPath("$", hasSize(3))) .andExpect(jsonPath("$[0].type", is(CmsPackageDto.CmsPackageTypeDto.DSC.name()))) + .andExpect(jsonPath("$[0].cms", is("signature1"))) .andExpect(jsonPath("$[1].type", is(CmsPackageDto.CmsPackageTypeDto.REVOCATION_LIST.name()))) - .andExpect(jsonPath("$[2].type", is(CmsPackageDto.CmsPackageTypeDto.VALIDATION_RULE.name()))); + .andExpect(jsonPath("$[1].cms", is(cmsBase64))) + .andExpect(jsonPath("$[2].type", is(CmsPackageDto.CmsPackageTypeDto.VALIDATION_RULE.name()))) + .andExpect(jsonPath("$[2].cms", is(cmsBase64))); } @Test @@ -597,10 +600,10 @@ void testUpdateRevocationWrongCountry() throws Exception { .andExpect(jsonPath("$.code", is("0x021"))); } - private void createSignerInfo(final String cmsBase64, final X509Certificate certDscEu) { + private void createSignerInfo(final String cmsBase64, final X509Certificate certDscEu, final String signature) { signerInformationRepository.save(new SignerInformationEntity( null, ZonedDateTime.now(), countryCode, certificateUtils.getCertThumbprint(certDscEu), - cmsBase64, "sig1", SignerInformationEntity.CertificateType.DSC + cmsBase64, signature, SignerInformationEntity.CertificateType.DSC )); }