Merge pull request #88 from agelostsal/devel

ET-130 AIADefaultSource should use the CommonsDataLoader
ARGOeu · Nov 23, 2022 · 294c799 · 294c799
2 parents 1768ca0 + 62b1dfc
commit 294c799
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/eseal/pom.xml b/eseal/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.16</version>
+            <version>1.18.24</version>
             <scope>provided</scope>
         </dependency>
         <!-- Hibernate validator - Bean validation API Implementation -->

diff --git a/eseal/src/main/java/gr/grnet/eseal/service/RemoteSignDocumentServicePKCS1.java b/eseal/src/main/java/gr/grnet/eseal/service/RemoteSignDocumentServicePKCS1.java
@@ -19,6 +19,7 @@
 import eu.europa.esig.dss.service.http.commons.CommonsDataLoader;
 import eu.europa.esig.dss.service.http.commons.OCSPDataLoader;
 import eu.europa.esig.dss.service.ocsp.OnlineOCSPSource;
+import eu.europa.esig.dss.spi.x509.aia.DefaultAIASource;
 import eu.europa.esig.dss.utils.Utils;
 import eu.europa.esig.dss.validation.CRLFirstRevocationDataLoadingStrategy;
 import eu.europa.esig.dss.validation.CommonCertificateVerifier;
@@ -108,6 +109,9 @@ public String signDocument(SignDocumentDto signDocumentDto) {
         onlineOCSPSource.setDataLoader(ocspDataLoader);
         commonCertificateVerifier.setOcspSource(onlineOCSPSource);
 
+        // AIA Source
+        commonCertificateVerifier.setAIASource(new DefaultAIASource(new CommonsDataLoader()));
+
         commonCertificateVerifier.setAlertOnMissingRevocationData(new ExceptionOnStatusAlert());
         commonCertificateVerifier.setAlertOnUncoveredPOE(new LogOnStatusAlert());
         commonCertificateVerifier.setAlertOnRevokedCertificate(new ExceptionOnStatusAlert());

diff --git a/eseal/src/main/java/gr/grnet/eseal/service/TimestampDocumentService.java b/eseal/src/main/java/gr/grnet/eseal/service/TimestampDocumentService.java
@@ -10,8 +10,10 @@
 import eu.europa.esig.dss.pades.PAdESTimestampParameters;
 import eu.europa.esig.dss.pades.signature.PAdESService;
 import eu.europa.esig.dss.service.crl.OnlineCRLSource;
+import eu.europa.esig.dss.service.http.commons.CommonsDataLoader;
 import eu.europa.esig.dss.service.http.commons.TimestampDataLoader;
 import eu.europa.esig.dss.service.ocsp.OnlineOCSPSource;
+import eu.europa.esig.dss.spi.x509.aia.DefaultAIASource;
 import eu.europa.esig.dss.utils.Utils;
 import eu.europa.esig.dss.validation.CommonCertificateVerifier;
 import gr.grnet.eseal.enums.TSASourceEnum;
@@ -48,6 +50,7 @@ public String timestampDocument(String document, TSASourceEnum tsaSourceEnum) {
     certificateVerifier.setDataLoader(new TimestampDataLoader());
     certificateVerifier.setCrlSource(new OnlineCRLSource());
     certificateVerifier.setOcspSource(new OnlineOCSPSource());
+    certificateVerifier.setAIASource(new DefaultAIASource(new CommonsDataLoader()));
 
     // Configure a PAdES service for PDF timestamping
     PAdESService service = new PAdESService(certificateVerifier);

diff --git a/eseal/src/main/java/gr/grnet/eseal/validation/DocumentValidatorLOTL.java b/eseal/src/main/java/gr/grnet/eseal/validation/DocumentValidatorLOTL.java
@@ -13,6 +13,7 @@
 import eu.europa.esig.dss.spi.client.http.IgnoreDataLoader;
 import eu.europa.esig.dss.spi.tsl.TrustedListsCertificateSource;
 import eu.europa.esig.dss.spi.x509.KeyStoreCertificateSource;
+import eu.europa.esig.dss.spi.x509.aia.DefaultAIASource;
 import eu.europa.esig.dss.tsl.alerts.LOTLAlert;
 import eu.europa.esig.dss.tsl.alerts.TLAlert;
 import eu.europa.esig.dss.tsl.alerts.detections.LOTLLocationChangeDetection;
@@ -107,6 +108,7 @@ private CertificateVerifier initializeCertificateVerifier() {
     certificateVerifier.setDataLoader(new CommonsDataLoader());
     certificateVerifier.setCrlSource(new OnlineCRLSource());
     certificateVerifier.setOcspSource(new OnlineOCSPSource());
+    certificateVerifier.setAIASource(new DefaultAIASource(new CommonsDataLoader()));
 
     return certificateVerifier;
   }