Merge branch 'fb-DSS-2872-fix-xades-by-upgrading-to-xmlsec-304' into 'main'

DSS-2872: Fix XAdESSigner by upgrading xmlsec

See merge request signserver/signserver!430

Author: nimas

signserver/lib/ext/xmlsec-3.0.3.jar signserver/lib/ext/xmlsec-3.0.4.jarsignserver/lib/ext/xmlsec-3.0.3.jar renamed to signserver/lib/ext/xmlsec-3.0.4.jar

@@ -157,5 +157,5 @@ a840968176645684bb01aed376e067ab39614885f9eee44abe35a5f20ebe7fad  ./ext/xml-apis
 47dcde8986019314ef78ae7280a94973a21d2ed95075a40a000b42da956429e1  ./ext/xml-resolver-1.2.jar;                             "Apache Xerces"
 34e08ee62116071cbb69c0ed70d15a7a5b208d62798c59f2120bb8929324cb63  ./ext/xmlpull-1.1.3.1.jar;                              "XmlPull"
 ab4ca02ae5634caf114161e40df94cb7e6bec2b33d372d46bd78189a4cb27dfa  ./ext/xmlschema-core-2.3.0.jar;                         "Apache XmlSchema Core"
-b23df0b77125345f549374a85ca93c74e09d548a6c92858923b9fd9a24d5188b  ./ext/xmlsec-3.0.3.jar;                                 "Santuario"
+0f87b5b5f9ea1adc853a11132b32e59f148a376cb3983592f2cb48cfffbde363  ./ext/xmlsec-3.0.4.jar;                                 "Santuario"
 bfc90e9e32d0eab1f397fb974b5f150a815188382ac41f372a7149d5bc178008  ./ext/xpp3_min-1.1.4c.jar;                              "Xpp3"

signserver/lib/jars-list.txt

@@ -111,6 +111,7 @@ public class P11SignTest {
     private static final int WORKER_CMS = 20003;
     private static final int WORKER_XML = 20004;
     private static final int WORKER_XML2 = 20014;
+    private static final int WORKER_XADES = 20024;
     private static final int WORKER_MSA = 20007;
     private static final int WORKER_TSA_ALTKEY = 20008;
     private static final int WORKER_PLAIN = 20020;
@@ -1625,4 +1626,36 @@ public void testBothP11LibraryNameAndOldSharedLibraryPropertyReferringSame() thr
             testCase.removeWorker(workerId);
         }
     }
+    
+    /**
+     * Exercises a signer using a separate token and where the private key is
+     * cached (in the worker).
+     */
+    @Test
+    public void testXAdESSigner_cached_separateToken() throws Exception {
+        final int workerId = WORKER_XADES;
+        try {
+            setupCryptoTokenProperties(CRYPTO_TOKEN, false);
+            workerSession.reloadConfiguration(CRYPTO_TOKEN);
+
+            setXAdESSignerPropertiesReferingToken(workerId);
+            workerSession.reloadConfiguration(workerId);
+
+            xmlSigner(workerId);
+        } finally {
+            testCase.removeWorker(workerId);
+        }
+    }
+    
+    private void setXAdESSignerPropertiesReferingToken(int workerId) {
+        // Setup worker
+        workerSession.setWorkerProperty(workerId, WorkerConfig.TYPE, WorkerType.PROCESSABLE.name());
+        workerSession.setWorkerProperty(workerId, WorkerConfig.IMPLEMENTATION_CLASS, "org.signserver.module.xades.signer.XAdESSigner");
+        workerSession.setWorkerProperty(workerId, "NAME", "XAdESSignerRefering");
+        workerSession.setWorkerProperty(workerId, "AUTHTYPE", "NOAUTH");
+        workerSession.setWorkerProperty(workerId, "DEFAULTKEY", existingKey1);
+        workerSession.setWorkerProperty(workerId, "CACHE_PRIVATEKEY", String.valueOf(true));
+        workerSession.setWorkerProperty(workerId, "CRYPTOTOKEN", CRYPTO_TOKEN_NAME);
+    }
+
 }

signserver/modules/SignServer-Test-P11/src/test/java/org/signserver/server/cryptotokens/P11SignTest.java

@@ -305,7 +305,7 @@ public void test14BasicXmlSignECDSADefaultSigAlg() throws Exception {
      */
     @Test
     public void test15XMLSecVersion() throws Exception {
-        checkDebugProperty("xml-sec.version", "3.0.3");
+        checkDebugProperty("xml-sec.version", "3.0.4");
     }
 
     /**

signserver/modules/SignServer-Test-System/src/test/java/org/signserver/module/xmlsigner/XMLSignerTest.java

@@ -166,7 +166,7 @@
             <dependency>
                 <groupId>org.apache.santuario</groupId>
                 <artifactId>xmlsec</artifactId>
-                <version>3.0.3</version>
+                <version>3.0.4</version>
             </dependency>
             <dependency>
                 <groupId>xerces</groupId>