Merge pull request #314 from solver-it-sro/AG-152/packaging-update

Clean up swagger for eforms and use default packaging with eforms
slovensko-digital · Nov 7, 2023 · 010a812 · 010a812
2 parents 1eff5ec + 2fff21d
commit 010a812
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/src/main/java/digital/slovensko/autogram/core/SigningParameters.java b/src/main/java/digital/slovensko/autogram/core/SigningParameters.java
@@ -1,12 +1,9 @@
 package digital.slovensko.autogram.core;
 
-import java.util.List;
-
 import javax.xml.crypto.dsig.CanonicalizationMethod;
 
 import digital.slovensko.autogram.core.errors.AutogramException;
 import digital.slovensko.autogram.core.errors.SigningParametersException;
-import digital.slovensko.autogram.core.errors.TransformationParsingErrorException;
 import digital.slovensko.autogram.util.AsicContainerUtils;
 import digital.slovensko.autogram.core.eforms.EFormResources;
 import digital.slovensko.autogram.core.eforms.EFormUtils;
@@ -222,6 +219,7 @@ private static SigningParameters buildParameters(SignatureLevel level, ASiCConta
                 identifier = eformAttributes.identifier();
                 containerXmlns = eformAttributes.containerXmlns();
                 container = eformAttributes.container();
+                packaging = eformAttributes.packaging();
             }
         }
 

diff --git a/src/main/java/digital/slovensko/autogram/core/eforms/EFormAttributes.java b/src/main/java/digital/slovensko/autogram/core/eforms/EFormAttributes.java
@@ -1,8 +1,9 @@
 package digital.slovensko.autogram.core.eforms;
 
 import eu.europa.esig.dss.enumerations.ASiCContainerType;
+import eu.europa.esig.dss.enumerations.SignaturePackaging;
 
 public record EFormAttributes(String identifier, String transformation, String schema, String containerXmlns,
-        ASiCContainerType container) {
+        ASiCContainerType container, SignaturePackaging packaging) {
 
 }
diff --git a/src/main/java/digital/slovensko/autogram/core/eforms/EFormResources.java b/src/main/java/digital/slovensko/autogram/core/eforms/EFormResources.java
@@ -13,6 +13,7 @@
 
 import eu.europa.esig.dss.enumerations.ASiCContainerType;
 import eu.europa.esig.dss.enumerations.DigestAlgorithm;
+import eu.europa.esig.dss.enumerations.SignaturePackaging;
 import eu.europa.esig.dss.model.DSSDocument;
 import eu.europa.esig.dss.model.InMemoryDocument;
 
@@ -47,8 +48,9 @@ public static EFormAttributes tryToLoadEFormAttributes(DSSDocument document, Str
         var identifier = eformResources.getIdentifier();
         var containerXmlns = "http://data.gov.sk/def/container/xmldatacontainer+xml/1.1";
         var container = ASiCContainerType.ASiC_E;
+        var packaging = SignaturePackaging.ENVELOPING;
 
-        return new EFormAttributes(identifier, transformation, schema, containerXmlns, container);
+        return new EFormAttributes(identifier, transformation, schema, containerXmlns, container, packaging);
     }
 
 

diff --git a/src/main/resources/digital/slovensko/autogram/server/server.yml b/src/main/resources/digital/slovensko/autogram/server/server.yml
@@ -656,9 +656,6 @@ components:
         parameters:
           autoLoadEform: true
           level: XAdES_BASELINE_B
-          container: ASiC_E
-          identifier: "http://data.gov.sk/doc/eform/App.GeneralAgenda/1.9"
-          containerXmlns: http://data.gov.sk/def/container/xmldatacontainer+xml/1.1
         payloadMimeType: application/xml
 
     XAdES-ASiC_E-SKXDC-Base64-TXT:
@@ -714,7 +711,6 @@ components:
         parameters:
           autoLoadEform: true
           level: XAdES_BASELINE_B
-          container: ASiC_E
         payloadMimeType: "application/vnd.etsi.asic-e+zip; base64"
 
     Signed-XAdES-ASiC_E-SKXDC-Auto-WrongXSLT:
@@ -724,7 +720,6 @@ components:
         parameters:
           autoLoadEform: true
           level: XAdES_BASELINE_B
-          container: ASiC_E
         payloadMimeType: "application/vnd.etsi.asic-e+zip; base64"
 
     PAdES-PDF_lg: