Merge branch 'SIVA-362' into master

Marten332 · Marten332 · commit c5436dcefc32 · 2022-08-25T17:07:16.000+03:00
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>ee.openid.siva</groupId>
     <artifactId>siva</artifactId>
-    <version>3.5.3</version>
+    <version>3.5.4</version>
     <packaging>pom</packaging>
     <name>SiVa Digitally signed documents validation service</name>
     <url>https://github.com/open-eid/SiVa</url>
diff --git a/siva-parent/pom.xml b/siva-parent/pom.xml
@@ -19,14 +19,14 @@
     <parent>
         <artifactId>siva</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>siva-parent</artifactId>
     <packaging>pom</packaging>
     <name>SiVa webapp and other core modules</name>
-    <version>3.5.3</version>
+    <version>3.5.4</version>
 
     <modules>
         <module>siva-validation-proxy</module>
diff --git a/siva-parent/siva-distribution/pom.xml b/siva-parent/siva-distribution/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>siva-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/siva-parent/siva-monitoring/pom.xml b/siva-parent/siva-monitoring/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>siva-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/siva-parent/siva-sample-application/pom.xml b/siva-parent/siva-sample-application/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>siva-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/siva-parent/siva-signature-service/pom.xml b/siva-parent/siva-signature-service/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>siva-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/siva-parent/siva-statistics/pom.xml b/siva-parent/siva-statistics/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>siva-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/siva-parent/siva-test/pom.xml b/siva-parent/siva-test/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>siva-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/siva-parent/siva-validation-proxy/pom.xml b/siva-parent/siva-validation-proxy/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>siva-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/siva-parent/siva-webapp/pom.xml b/siva-parent/siva-webapp/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>siva-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/validation-services-parent/generic-validation-service/pom.xml b/validation-services-parent/generic-validation-service/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>validation-services-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/validation-services-parent/generic-validation-service/src/main/java/ee/openeid/validation/service/generic/validator/report/GenericValidationReportBuilder.java b/validation-services-parent/generic-validation-service/src/main/java/ee/openeid/validation/service/generic/validator/report/GenericValidationReportBuilder.java
@@ -436,11 +436,14 @@ private String formatDate(Date date) {
 
     private String getOcspResponseTime(String signatureId) {
         SignatureWrapper signatureWrapper = dssReports.getDiagnosticData().getSignatureById(signatureId);
-        List<RelatedRevocationWrapper> revocations = signatureWrapper.foundRevocations().getRelatedRevocationData();
+        if (signatureWrapper.getSigningCertificate() == null) {
+            return null;
+        }
+        List<CertificateRevocationWrapper> revocations = signatureWrapper.getSigningCertificate().getCertificateRevocationData();
         if (revocations.isEmpty()) {
             return null;
         }
-        RelatedRevocationWrapper revocationWrapper = revocations.get(0);
+        CertificateRevocationWrapper revocationWrapper = revocations.get(0);
         return revocationWrapper.getRevocationType() == RevocationType.CRL ? null : formatDate(revocationWrapper.getProductionDate());
     }
 
diff --git a/validation-services-parent/generic-validation-service/src/test/java/ee/openeid/validation/service/generic/validator/report/GenericValidationReportBuilderTest.java b/validation-services-parent/generic-validation-service/src/test/java/ee/openeid/validation/service/generic/validator/report/GenericValidationReportBuilderTest.java
@@ -28,6 +28,7 @@
 import eu.europa.esig.dss.diagnostic.TimestampWrapper;
 import eu.europa.esig.dss.diagnostic.jaxb.XmlBasicSignature;
 import eu.europa.esig.dss.diagnostic.jaxb.XmlCertificate;
+import eu.europa.esig.dss.diagnostic.jaxb.XmlCertificateRevocation;
 import eu.europa.esig.dss.diagnostic.jaxb.XmlContainerInfo;
 import eu.europa.esig.dss.diagnostic.jaxb.XmlDiagnosticData;
 import eu.europa.esig.dss.diagnostic.jaxb.XmlDigestAlgoAndValue;
@@ -337,7 +338,7 @@ public void populatesOcspResponseCreationTime(){
     public void ocspResponseIsEmpty() {
         XmlDiagnosticData diagnosticData = getDiagnosticDataJaxb("");
 
-        diagnosticData.getSignatures().get(0).setFoundRevocations(null);
+        diagnosticData.getSignatures().get(0).getSigningCertificate().getCertificate().setRevocations(null);
         eu.europa.esig.dss.validation.reports.Reports dssReports = new eu.europa.esig.dss.validation.reports.Reports(diagnosticData, null, getSimpleReport(), null);
 
         ReportBuilderData reportBuilderData = getReportBuilderData(dssReports);
@@ -502,6 +503,11 @@ private XmlDiagnosticData getDiagnosticDataJaxb(String policyId) {
         XmlSigningCertificate signingCertificate = new XmlSigningCertificate();
         XmlCertificate certificate = new XmlCertificate();
         certificate.setId("SIG-CERT-id");
+        List<XmlCertificateRevocation> XmlCertificateRevocations = new ArrayList<>();
+        XmlCertificateRevocation xmlCertificateRevocation = new XmlCertificateRevocation();
+        xmlCertificateRevocation.setRevocation(xmlRevocation);
+        XmlCertificateRevocations.add(xmlCertificateRevocation);
+        certificate.setRevocations(XmlCertificateRevocations);
         signingCertificate.setCertificate(certificate);
 
         xmlSignature.setSigningCertificate(signingCertificate);
diff --git a/validation-services-parent/pom.xml b/validation-services-parent/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>siva</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
diff --git a/validation-services-parent/timemark-container-validation-service/pom.xml b/validation-services-parent/timemark-container-validation-service/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>validation-services-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/validation-services-parent/timestamptoken-validation-service/pom.xml b/validation-services-parent/timestamptoken-validation-service/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>validation-services-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/validation-services-parent/tsl-loader/pom.xml b/validation-services-parent/tsl-loader/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>validation-services-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/validation-services-parent/validation-commons/pom.xml b/validation-services-parent/validation-commons/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>validation-services-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/validation-services-parent/xroad-validation-service/pom.xml b/validation-services-parent/xroad-validation-service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>validation-services-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
