You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2023/08/28 06:18:25 UTC
[santuario-xml-security-java] branch 3.0.x-fixes updated (69615695 -> e6afeddf)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/santuario-xml-security-java.git
from 69615695 Make provider in JCEMapper.java Thread-safe (#195)
new 73641d49 Adding a "bouncycastle" provider to run the bouncycastle specific tests (#204)
new e6afeddf Fixup
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 18 +++++---
.../dom/algorithms/SignatureAlgorithmTest.java | 27 ++++++-----
.../test/dom/signature/EDDSASignatureTest.java | 9 ++--
.../security/test/dom/signature/SignatureTest.java | 52 +++++++++++++---------
.../javax/xml/crypto/dsig/EdDSATestAbstract.java | 22 +++++++--
.../crypto/dsig/SignatureValidatorEdDSATest.java | 2 +
.../xml/crypto/dsig/XMLSignatureEdDSATest.java | 2 +
7 files changed, 85 insertions(+), 47 deletions(-)
[santuario-xml-security-java] 02/02: Fixup
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/santuario-xml-security-java.git
commit e6afeddfd3829e2746fd29b9250dfd6a7c85160e
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Aug 28 06:58:24 2023 +0100
Fixup
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 9a25c37b..a8b92ecd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -629,6 +629,7 @@
</pluginManagement>
</build>
</profile>
+ <profile>
<id>bouncycastle</id>
<dependencies>
<dependency>
[santuario-xml-security-java] 01/02: Adding a "bouncycastle" provider to run the bouncycastle specific tests (#204)
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/santuario-xml-security-java.git
commit 73641d49c28a31495a338f336074248f3de57e73
Author: Colm O hEigeartaigh <co...@users.noreply.github.com>
AuthorDate: Mon Aug 28 06:51:20 2023 +0100
Adding a "bouncycastle" provider to run the bouncycastle specific tests (#204)
---
pom.xml | 17 ++++---
.../dom/algorithms/SignatureAlgorithmTest.java | 27 ++++++-----
.../test/dom/signature/EDDSASignatureTest.java | 9 ++--
.../security/test/dom/signature/SignatureTest.java | 52 +++++++++++++---------
.../javax/xml/crypto/dsig/EdDSATestAbstract.java | 22 +++++++--
.../crypto/dsig/SignatureValidatorEdDSATest.java | 2 +
.../xml/crypto/dsig/XMLSignatureEdDSATest.java | 2 +
7 files changed, 84 insertions(+), 47 deletions(-)
diff --git a/pom.xml b/pom.xml
index e0ecd452..9a25c37b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,12 +202,6 @@
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- <version>${bcprov.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
@@ -635,6 +629,15 @@
</pluginManagement>
</build>
</profile>
-
+ <id>bouncycastle</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk18on</artifactId>
+ <version>${bcprov.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java b/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java
index 08f27fdc..f4fac33e 100644
--- a/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java
@@ -103,18 +103,23 @@ public class SignatureAlgorithmTest {
assertFalse(algorithmHash.isEmpty());
Document doc = TestUtils.newDocument();
- Provider provider = new org.bouncycastle.jce.provider.BouncyCastleProvider();
-
- for (String algorithmURI : algorithmHash.keySet()) {
- try {
- AlgorithmParameterSpec spec = algorithmURI.equals(XMLSignature.ALGO_ID_SIGNATURE_RSA_PSS)
- ? new PSSParameterSpec("SHA-256", "MGF1", MGF1ParameterSpec.SHA256, 32, 1)
- : null;
- SignatureAlgorithm signatureAlgorithm = new SignatureAlgorithm(doc, algorithmURI, provider, spec);
- assertEquals(provider.getName(), signatureAlgorithm.getJCEProviderName());
- } catch (XMLSecurityException e) {
- assertEquals("", Arrays.asList(e.getStackTrace()).toString());
+ try {
+ Class<?> bouncyCastleProviderClass = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ Provider provider = (Provider)bouncyCastleProviderClass.getConstructor().newInstance();
+
+ for (String algorithmURI : algorithmHash.keySet()) {
+ try {
+ AlgorithmParameterSpec spec = algorithmURI.equals(XMLSignature.ALGO_ID_SIGNATURE_RSA_PSS)
+ ? new PSSParameterSpec("SHA-256", "MGF1", MGF1ParameterSpec.SHA256, 32, 1)
+ : null;
+ SignatureAlgorithm signatureAlgorithm = new SignatureAlgorithm(doc, algorithmURI, provider, spec);
+ assertEquals(provider.getName(), signatureAlgorithm.getJCEProviderName());
+ } catch (XMLSecurityException e) {
+ assertEquals("", Arrays.asList(e.getStackTrace()).toString());
+ }
}
+ } catch (ReflectiveOperationException e) {
+ // BouncyCastle not installed, ignore
}
}
diff --git a/src/test/java/org/apache/xml/security/test/dom/signature/EDDSASignatureTest.java b/src/test/java/org/apache/xml/security/test/dom/signature/EDDSASignatureTest.java
index 33aeedf8..8ca0255e 100644
--- a/src/test/java/org/apache/xml/security/test/dom/signature/EDDSASignatureTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/signature/EDDSASignatureTest.java
@@ -43,6 +43,7 @@ import org.apache.xml.security.transforms.Transforms;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Test;
import org.w3c.dom.Element;
@@ -60,7 +61,7 @@ public class EDDSASignatureTest extends EdDSATestAbstract {
@Test
public void testEd22519() throws Exception {
-
+ Assumptions.assumeTrue(isEdDSASupported());
KeyStore keyStore = KeyStore.getInstance(EDDSA_KS_TYPE);
keyStore.load(Files.newInputStream(Paths.get(EDDSA_KS)), EDDSA_KS_PASSWORD.toCharArray());
@@ -72,7 +73,7 @@ public class EDDSASignatureTest extends EdDSATestAbstract {
@Test
public void testEd22519VerifyXML() throws Exception {
-
+ Assumptions.assumeTrue(isEdDSASupported());
try (InputStream xmlSignatureExample
= EDDSASignatureTest.class.getResourceAsStream("/org/apache/xml/security/samples/input/eddsaEd25519Signature.xml")) {
doVerify(xmlSignatureExample);
@@ -81,7 +82,7 @@ public class EDDSASignatureTest extends EdDSATestAbstract {
@Test
public void testEd448VerifyXML() throws Exception {
-
+ Assumptions.assumeTrue(isEdDSASupported());
try (InputStream xmlSignatureExample
= EDDSASignatureTest.class.getResourceAsStream("/org/apache/xml/security/samples/input/eddsaEd448Signature.xml")) {
doVerify(xmlSignatureExample);
@@ -90,7 +91,7 @@ public class EDDSASignatureTest extends EdDSATestAbstract {
@Test
public void testEd448() throws Exception {
-
+ Assumptions.assumeTrue(isEdDSASupported());
KeyStore keyStore = KeyStore.getInstance(EDDSA_KS_TYPE);
keyStore.load(Files.newInputStream(Paths.get(EDDSA_KS)), EDDSA_KS_PASSWORD.toCharArray());
diff --git a/src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java b/src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java
index 9fbcfadd..803c651c 100644
--- a/src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java
@@ -18,10 +18,7 @@
*/
package org.apache.xml.security.test.dom.signature;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.PublicKey;
+import java.security.*;
import java.util.Enumeration;
import org.apache.xml.security.Init;
@@ -69,17 +66,23 @@ public class SignatureTest {
@Test
public void testSigningVerifyingFromRebuildSignatureWithProvider() throws Throwable {
- Provider provider = new org.bouncycastle.jce.provider.BouncyCastleProvider();
- Document doc = getOriginalDocument();
- XMLSignature signature = signDocument(doc, provider);
- assertEquals(provider.getName(), signature.getSignedInfo().getSignatureAlgorithm().getJCEProviderName());
-
- Element signatureElem = (Element) doc.getElementsByTagNameNS(DS_NS, "Signature").item(0);
- signature = new XMLSignature(signatureElem, "", provider);
- assertEquals(provider.getName(), signature.getSignedInfo().getSignatureAlgorithm().getJCEProviderName());
-
- PublicKey pubKey = getPublicKey();
- assertTrue(signature.checkSignatureValue(pubKey));
+ try {
+ Class<?> bouncyCastleProviderClass = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ Provider provider = (Provider)bouncyCastleProviderClass.getConstructor().newInstance();
+
+ Document doc = getOriginalDocument();
+ XMLSignature signature = signDocument(doc, provider);
+ assertEquals(provider.getName(), signature.getSignedInfo().getSignatureAlgorithm().getJCEProviderName());
+
+ Element signatureElem = (Element) doc.getElementsByTagNameNS(DS_NS, "Signature").item(0);
+ signature = new XMLSignature(signatureElem, "", provider);
+ assertEquals(provider.getName(), signature.getSignedInfo().getSignatureAlgorithm().getJCEProviderName());
+
+ PublicKey pubKey = getPublicKey();
+ assertTrue(signature.checkSignatureValue(pubKey));
+ } catch (ReflectiveOperationException e) {
+ // BouncyCastle not installed, ignore
+ }
}
@Test
@@ -93,13 +96,18 @@ public class SignatureTest {
@Test
public void testSigningVerifyingFromExistingSignatureWithProvider() throws Throwable {
- Provider provider = new org.bouncycastle.jce.provider.BouncyCastleProvider();
- Document doc = getOriginalDocument();
- XMLSignature signature = signDocument(doc, provider);
- assertEquals(provider.getName(), signature.getSignedInfo().getSignatureAlgorithm().getJCEProviderName());
-
- PublicKey pubKey = getPublicKey();
- assertTrue(signature.checkSignatureValue(pubKey));
+ try {
+ Class<?> bouncyCastleProviderClass = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ Provider provider = (Provider)bouncyCastleProviderClass.getConstructor().newInstance();
+ Document doc = getOriginalDocument();
+ XMLSignature signature = signDocument(doc, provider);
+ assertEquals(provider.getName(), signature.getSignedInfo().getSignatureAlgorithm().getJCEProviderName());
+
+ PublicKey pubKey = getPublicKey();
+ assertTrue(signature.checkSignatureValue(pubKey));
+ } catch (ReflectiveOperationException e) {
+ // BouncyCastle not installed, ignore
+ }
}
@Test
diff --git a/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/EdDSATestAbstract.java b/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/EdDSATestAbstract.java
index fb16d961..58eea15d 100644
--- a/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/EdDSATestAbstract.java
+++ b/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/EdDSATestAbstract.java
@@ -18,6 +18,7 @@
*/
package org.apache.xml.security.test.javax.xml.crypto.dsig;
+import java.security.Provider;
import java.security.Security;
import javax.xml.crypto.dsig.dom.DOMValidateContext;
@@ -39,6 +40,8 @@ public abstract class EdDSATestAbstract {
public static final String EDDSA_KS_TYPE = "PKCS12";
private static boolean bcAddedForTheTest = false;
+ private static boolean edDSASupported = true;
+
@BeforeAll
public static void beforeAll() {
Security.insertProviderAt
@@ -52,8 +55,17 @@ public abstract class EdDSATestAbstract {
} catch (NumberFormatException ex) {
isNotJDK15up = true;
}
- if (isNotJDK15up && Security.getProvider(org.bouncycastle.jce.provider.BouncyCastleProvider.PROVIDER_NAME) == null) {
- Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
+
+ if (isNotJDK15up && Security.getProvider("BC") == null) {
+ // Use reflection to add new BouncyCastleProvider
+ try {
+ Class<?> bouncyCastleProviderClass = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ Provider bouncyCastleProvider = (Provider)bouncyCastleProviderClass.getConstructor().newInstance();
+ Security.addProvider(bouncyCastleProvider);
+ } catch (ReflectiveOperationException e) {
+ // BouncyCastle not installed, ignore
+ edDSASupported = false;
+ }
bcAddedForTheTest = true;
}
}
@@ -61,10 +73,14 @@ public abstract class EdDSATestAbstract {
@AfterAll
public static void afterAll() {
if (bcAddedForTheTest) {
- Security.removeProvider(org.bouncycastle.jce.provider.BouncyCastleProvider.PROVIDER_NAME);
+ Security.removeProvider("BC");
}
}
+ public static boolean isEdDSASupported() {
+ return edDSASupported;
+ }
+
public void updateIdReferences(DOMValidateContext vc, String elementName, String idAttributeName) {
Document doc = vc.getNode().getOwnerDocument();
NodeList nl = doc.getElementsByTagName(elementName);
diff --git a/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/SignatureValidatorEdDSATest.java b/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/SignatureValidatorEdDSATest.java
index c31ea4ee..967b170d 100644
--- a/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/SignatureValidatorEdDSATest.java
+++ b/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/SignatureValidatorEdDSATest.java
@@ -24,6 +24,7 @@ import java.nio.file.Paths;
import javax.xml.crypto.dsig.dom.DOMValidateContext;
import org.apache.xml.security.test.javax.xml.crypto.KeySelectors;
+import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
@@ -56,6 +57,7 @@ public class SignatureValidatorEdDSATest extends EdDSATestAbstract {
public void test_enveloping_signature_with_ID(String filename, String result, String message) throws Exception {
DOMValidateContext vc = testInstance.getValidateContext
(filename, new KeySelectors.RawX509KeySelector());
+ Assumptions.assumeTrue(isEdDSASupported());
updateIdReferences(vc);
boolean coreValidity = testInstance.validate(vc);
diff --git a/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/XMLSignatureEdDSATest.java b/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/XMLSignatureEdDSATest.java
index 0fc22027..debd7e31 100644
--- a/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/XMLSignatureEdDSATest.java
+++ b/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/XMLSignatureEdDSATest.java
@@ -53,6 +53,7 @@ import org.apache.xml.security.test.javax.xml.crypto.KeySelectors;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import org.w3c.dom.Element;
@@ -76,6 +77,7 @@ public class XMLSignatureEdDSATest extends EdDSATestAbstract {
"http://www.w3.org/2021/04/xmldsig-more#eddsa-ed448,ed448",
})
public void createEdDSASignatureTest(String signatureAlgorithm, String alias) throws Exception {
+ Assumptions.assumeTrue(isEdDSASupported());
byte[] buff = doSign(signatureAlgorithm, alias);
Assertions.assertNotNull(buff);
assertValidSignature(buff);