Merge pull request #455 from slovensko-digital/revert/updated-fs-xdc

Revert FS XDC identifier builder to former version within identifier

src/main/java/digital/slovensko/autogram/core/eforms/FsEFormResources.java

@@ -72,11 +72,11 @@ private static String getFormUrlFromXdcIdentifier(String xdcIdentifier) {
 
             r = getSlugAndVersion(xpath, parsed_meta_xml, "//" + ns + ":form[@xdcIdentifier=\"" + xdcIdentifier + "/1.0\"]");
             if (r != null)
-                throw new EFormException("Nesprávny XDC identifikátor v podpísanom formulári", "XDC identifikátor v tomto konkrétnom podpísanom formulári by mal obsahovať ešte označenie verzie /1.0. Takto podpísaný formulár bude pravdepodobne odmietnutý informačným systémom Finančnej správy.");
+                return r;
 
             r = getSlugAndVersion(xpath, parsed_meta_xml, "//" + ns + ":form[@xdcIdentifier=\"" + xdcIdentifier.replace("/1.0", "") + "\"]");
             if (r != null)
-                throw new EFormException("Nesprávny XDC identifikátor v podpísanom formulári", "XDC identifikátor v tomto konkrétnom podpísanom formulári by nemal obsahovať označenie verzie /1.0. Takto podpísaný formulár bude pravdepodobne odmietnutý informačným systémom Finančnej správy.");
+                return r;
 
         } catch (XPathExpressionException e) {
             throw new UnrecognizedException(e);
@@ -175,6 +175,9 @@ public EFormAttributes getEformAttributes() {
     }
 
     public String getIdentifier() {
-        return xdcIdentifier;
+        if (xdcIdentifier.matches(".*/[v0-9.]+$"))
+            return xdcIdentifier;
+
+        return xdcIdentifier + "/1.0";
     }
 }

src/test/java/digital/slovensko/autogram/AutogramTests.java

@@ -40,8 +40,7 @@ class AutogramTests {
             "digital.slovensko.autogram.TestMethodSources#orsrDocumentsProvider",
             "digital.slovensko.autogram.TestMethodSources#validOtherDocumentsProvider",
             "digital.slovensko.autogram.TestMethodSources#validXadesDocumentsProvider",
-            "digital.slovensko.autogram.TestMethodSources#fsDPFOProvider",
-            "digital.slovensko.autogram.TestMethodSources#fsUnmarkedXdcProvider"})
+            "digital.slovensko.autogram.TestMethodSources#fsDPFOProvider" })
     void testSignAsiceXadesHappyScenario(InMemoryDocument document) {
         var settings = new TestSettings();
         var newUI = new FakeUI();

src/test/java/digital/slovensko/autogram/SigningParametersTests.java

@@ -220,13 +220,6 @@ void testThrowsOriginalDocumentNotFoundWithAsiceWithoutSignature(DSSDocument doc
                 () -> SigningParameters.buildForASiCWithXAdES(document, false, false, tspSource, true));
     }
 
-    @ParameterizedTest
-    @MethodSource("digital.slovensko.autogram.TestMethodSources#fsWrongXdcIdentifierProvider")
-    void testThrowsEFormExceptionWithWrongFsXdcIdentifier(DSSDocument document) throws IOException {
-        Assertions.assertThrows(EFormException.class,
-                () -> SigningParameters.buildForASiCWithXAdES(document, false, false, tspSource, true));
-    }
-
     @Test
     void testThrowsExceptionWithAsiceWithEmptyXml() throws IOException {
         var document = new InMemoryDocument(

src/test/java/digital/slovensko/autogram/TestMethodSources.java

@@ -67,18 +67,6 @@ public static Stream<DSSDocument> fsUnmarkedXdcProvider() throws IOException {
         );
     }
 
-    public static Stream<DSSDocument> fsWrongXdcIdentifierProvider() throws IOException {
-        var xdc = cls.getResourceAsStream("fs_forms/d_fs792_772_xdc_wrong_identifier.xml").readAllBytes();
-        var asice = cls.getResourceAsStream("fs_forms/signed_wrong_identifier.asice").readAllBytes();
-        var asiceMarked = cls.getResourceAsStream("fs_forms/d_fs792_772_xdc_wrong_identifier.asice").readAllBytes();
-
-        return Stream.of(
-            new InMemoryDocument(xdc, "d_fs792_772_xdc_wrong_identifier.xml", AutogramMimeType.XML_DATACONTAINER),
-            new InMemoryDocument(asice, "signed_wrong_identifier.asice", MimeTypeEnum.ASICE),
-            new InMemoryDocument(asiceMarked, "d_fs792_772_xdc_wrong_identifier.asice", MimeTypeEnum.ASICE)
-        );
-    }
-
     public static Stream<DSSDocument> invalidXmlProvider() throws IOException {
         var notAnXml = "not an xml".getBytes();
         var invalidXml = "<invalidXml><foo><bar></foo></bar></invalidXml>".getBytes();

src/test/resources/digital/slovensko/autogram/fs_forms/d_fs792_772_xdc_indented.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xdc:XMLDataContainer xmlns:xdc="http://data.gov.sk/def/container/xmldatacontainer+xml/1.1">
     <xdc:XMLData ContentType="application/xml; charset=UTF-8"
-                 Identifier="https://ekr.financnasprava.sk/Formulare/xsd/dpfo_b2023.xsd" Version="1.0">
+                 Identifier="https://ekr.financnasprava.sk/Formulare/xsd/dpfo_b2023.xsd/1.0" Version="1.0">
         <dokument>
             <hlavicka>
                 <dic>2120515056</dic>

src/test/resources/digital/slovensko/autogram/fs_forms/d_fs792_772_xdc_xsd_digest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xdc:XMLDataContainer xmlns:xdc="http://data.gov.sk/def/container/xmldatacontainer+xml/1.1">
     <xdc:XMLData ContentType="application/xml; charset=UTF-8"
-                 Identifier="https://ekr.financnasprava.sk/Formulare/xsd/dpfo_b2023.xsd" Version="1.0">
+                 Identifier="https://ekr.financnasprava.sk/Formulare/xsd/dpfo_b2023.xsd/1.0" Version="1.0">
         <dokument>
             <hlavicka>
                 <dic>2120515056</dic>

src/test/resources/digital/slovensko/autogram/fs_forms/d_fs792_772_xdc_xslt_digest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xdc:XMLDataContainer xmlns:xdc="http://data.gov.sk/def/container/xmldatacontainer+xml/1.1">
     <xdc:XMLData ContentType="application/xml; charset=UTF-8"
-                 Identifier="https://ekr.financnasprava.sk/Formulare/xsd/dpfo_b2023.xsd" Version="1.0">
+                 Identifier="https://ekr.financnasprava.sk/Formulare/xsd/dpfo_b2023.xsd/1.0" Version="1.0">
         <dokument>
             <hlavicka>
                 <dic>2120515056</dic>

src/test/resources/digital/slovensko/autogram/fs_forms/unmarked_xdc_indented.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xdc:XMLDataContainer xmlns:xdc="http://data.gov.sk/def/container/xmldatacontainer+xml/1.1">
     <xdc:XMLData ContentType="application/xml; charset=UTF-8"
-                 Identifier="https://ekr.financnasprava.sk/Formulare/xsd/dpfo_b2023.xsd" Version="1.0">
+                 Identifier="https://ekr.financnasprava.sk/Formulare/xsd/dpfo_b2023.xsd/1.0" Version="1.0">
         <dokument>
             <hlavicka>
                 <dic>2120515056</dic>