Release 1.15.0

CHANGELOG.md

@@ -1,4 +1,10 @@
 
+## 1.15.0 (29-01-2024)
+
+### Novità: 2
+- [#31006](https://parermine.regione.emilia-romagna.it/issues/31006) Introduzione PARER custom policy constraint.xml
+- [#30988](https://parermine.regione.emilia-romagna.it/issues/30988) Aggiornamento libreria DSS 5.13
+
 ## 1.14.0 (05-12-2023)
 
 ### Novità: 1

CONTAINER-SCAN-REPORT.md

@@ -1,7 +1,7 @@
 ## Container scan evidence CVE
 <strong>Image name:</strong> registry.ente.regione.emr.it/parer/okd/verifica-firma-eidas:sast
-<br/><strong>Run date:</strong> Tue Dec 5 14:02:28 CET 2023
-<br/><strong>Produced by:</strong> <a href="https://gitlab.ente.regione.emr.it/parer/okd/verifica-firma-eidas/-/jobs/140656">Job</a>
+<br/><strong>Run date:</strong> Mon Jan 29 12:20:03 CET 2024
+<br/><strong>Produced by:</strong> <a href="https://gitlab.ente.regione.emr.it/parer/okd/verifica-firma-eidas/-/jobs/156713">Job</a>
 <br/><strong>CVE founded:</strong> 0
 | CVE | Description | Severity | Solution | 
 |:---:|:---|:---:|:---|

RELEASE-NOTES.md

@@ -1,4 +1 @@
-## 1.14.0 (05-12-2023)
-
-### Novità: 1
-- [#30720](https://parermine.regione.emilia-romagna.it/issues/30720) Eliminazione delle logiche custom per estrarre informazioni dal report Eidas
+## 1.15.0 (29-01-2024)

pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>verifica-firma-eidas</artifactId>
-	<version>1.14.1-SNAPSHOT</version>
+	<version>1.15.1-SNAPSHOT</version>
 	<packaging>${packaging.type}</packaging>
 	<name>Verifica Firma EIDAS</name>
 	<description>Progetto per effettuare firme e validazioni con librerie DSS (EIDAS)</description>
@@ -21,8 +21,8 @@
 		<!-- Applied for jdk11 bug -->
 		<detectJavaApiLink>false</detectJavaApiLink>
         <!-- third party libs -->		
-		<dss.version>5.12.1</dss.version>
-		<springboot.version>3.0.9</springboot.version>
+		<dss.version>5.13</dss.version>
+		<springboot.version>3.1.7</springboot.version>
 		<springdoc-openapi-starter-webmvc-ui.version>2.1.0</springdoc-openapi-starter-webmvc-ui.version>		
 		<logstash-logback-encoder.version>7.2</logstash-logback-encoder.version>
 		<tika.version>2.8.0</tika.version>
@@ -38,7 +38,7 @@
 		<font-awesome.version>6.4.0</font-awesome.version>
 		<fop.version>2.7</fop.version>
 		<!-- custom libs -->
-		<verificafirma-eidas-beans.version>1.8.0</verificafirma-eidas-beans.version>
+		<verificafirma-eidas-beans.version>1.9.0</verificafirma-eidas-beans.version>
 		<start-class>it.eng.parer.eidas.web.VerificaFirmaEidasApplication</start-class>	
 	</properties>
 
@@ -490,6 +490,27 @@
 							<goal>report</goal>
 						</goals>
 					</execution>
+					<!-- check della coverage minima -->
+					<execution>
+						<id>jacoco-check</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<configuration>
+							<rules>
+								<rule>
+									<element>BUNDLE</element>
+									<limits>
+										<limit>
+											<counter>LINE</counter>
+											<value>COVEREDRATIO</value>
+											<minimum>0.35</minimum>
+										</limit>
+									</limits>
+								</rule>
+							</rules>
+						</configuration>
+					</execution>					
 				</executions>
 			</plugin>
 

src/main/java/it/eng/parer/eidas/core/helper/ReportRenderingHelper.java

@@ -50,12 +50,12 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import eu.europa.esig.dss.DSSXmlErrorListener;
-import eu.europa.esig.dss.DomUtils;
 import eu.europa.esig.dss.detailedreport.jaxb.XmlDetailedReport;
 import eu.europa.esig.dss.diagnostic.jaxb.XmlDiagnosticData;
 import eu.europa.esig.dss.simplereport.jaxb.XmlSimpleReport;
 import eu.europa.esig.dss.utils.Utils;
+import eu.europa.esig.dss.xml.utils.DSSXmlErrorListener;
+import eu.europa.esig.dss.xml.utils.DomUtils;
 import it.eng.parer.eidas.web.bean.VerificaFirmaResultBean;
 import jakarta.annotation.PostConstruct;
 

src/main/java/it/eng/parer/eidas/core/service/CustomRemoteDocumentValidationImpl.java

@@ -371,6 +371,11 @@ private ValidationPolicy compileValidationPolicy(EidasDataToValidateMetadata dat
                     validationPolicyJaxb.getTimestampConstraints().getBasicSignatureConstraints()
                             .getReferenceDataIntact().getLevel(),
                     Level.IGNORE);
+
+            validationPolicyJaxb.getCryptographic().getAlgoExpirationDate().setLevel(Level.IGNORE);
+            log.atDebug().log(
+                    "Validation policy: cryptographic/getAlgoExpirationDate constraint original level {}, to level {}",
+                    validationPolicyJaxb.getCryptographic().getAlgoExpirationDate().getLevel(), Level.IGNORE);
         }
 
         if (controlloCatenaTrustIgnorato) {
@@ -626,7 +631,8 @@ private SignedDocumentValidator buildValidator(DSSDocument signedDocument,
             signedDocValidator.setTokenExtractionStrategy(TokenExtractionStrategy.fromParameters(
                     dataToValidateMetadata.isIncludeCertificateRevocationValues(),
                     dataToValidateMetadata.isIncludeTimestampTokenValues(),
-                    dataToValidateMetadata.isIncludeCertificateTokenValues()));
+                    dataToValidateMetadata.isIncludeCertificateTokenValues(),
+                    dataToValidateMetadata.isIncludEvidenceRecordValues()));
             signedDocValidator.setIncludeSemantics(dataToValidateMetadata.isIncludeSemanticTokenValues());
             //
             signedDocValidator.setCertificateVerifier(verifier);