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 2018/06/06 15:09:43 UTC
svn commit: r1833038 [6/7] - in
/santuario/xml-security-java/branches/2.0.x-fixes: ./
src/main/java/org/apache/jcp/xml/dsig/internal/dom/
src/main/java/org/apache/xml/security/
src/main/java/org/apache/xml/security/c14n/
src/main/java/org/apache/xml/se...
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java Wed Jun 6 15:09:42 2018
@@ -29,6 +29,7 @@ import java.security.Security;
import java.util.ArrayList;
import java.util.List;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.TransformerFactory;
@@ -103,7 +104,8 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
String signatureAlgorithm = "http://www.w3.org/2000/09/xmldsig#rsa-sha1";
List<String> localNames = new ArrayList<String>();
@@ -131,7 +133,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -140,7 +142,8 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";
List<String> localNames = new ArrayList<String>();
@@ -168,7 +171,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -177,7 +180,8 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha384";
List<String> localNames = new ArrayList<String>();
@@ -205,7 +209,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -214,7 +218,8 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512";
List<String> localNames = new ArrayList<String>();
@@ -242,7 +247,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -254,7 +259,8 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160";
List<String> localNames = new ArrayList<String>();
@@ -282,7 +288,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -294,7 +300,8 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
String signatureAlgorithm = "http://www.w3.org/2007/05/xmldsig-more#sha1-rsa-MGF1";
List<String> localNames = new ArrayList<String>();
@@ -322,7 +329,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -334,7 +341,8 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
String signatureAlgorithm = "http://www.w3.org/2007/05/xmldsig-more#sha224-rsa-MGF1";
List<String> localNames = new ArrayList<String>();
@@ -362,7 +370,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -374,7 +382,8 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
String signatureAlgorithm = "http://www.w3.org/2007/05/xmldsig-more#sha256-rsa-MGF1";
List<String> localNames = new ArrayList<String>();
@@ -402,7 +411,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -414,7 +423,8 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
String signatureAlgorithm = "http://www.w3.org/2007/05/xmldsig-more#sha384-rsa-MGF1";
List<String> localNames = new ArrayList<String>();
@@ -442,7 +452,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -454,7 +464,8 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
String signatureAlgorithm = "http://www.w3.org/2007/05/xmldsig-more#sha512-rsa-MGF1";
List<String> localNames = new ArrayList<String>();
@@ -482,7 +493,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -491,7 +502,8 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1";
List<String> localNames = new ArrayList<String>();
@@ -519,7 +531,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -528,7 +540,8 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224";
List<String> localNames = new ArrayList<String>();
@@ -556,7 +569,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -565,7 +578,8 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256";
List<String> localNames = new ArrayList<String>();
@@ -593,7 +607,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -602,7 +616,8 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384";
List<String> localNames = new ArrayList<String>();
@@ -630,7 +645,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -639,7 +654,8 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512";
List<String> localNames = new ArrayList<String>();
@@ -667,7 +683,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -679,7 +695,8 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
String signatureAlgorithm = "http://www.w3.org/2007/05/xmldsig-more#ecdsa-ripemd160";
List<String> localNames = new ArrayList<String>();
@@ -707,7 +724,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java Wed Jun 6 15:09:42 2018
@@ -37,6 +37,7 @@ import org.w3c.dom.Document;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -89,7 +90,8 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-dsa-detached.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -107,7 +109,7 @@ public class PhaosTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -121,7 +123,8 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-dsa-enveloped.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -139,7 +142,7 @@ public class PhaosTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -148,7 +151,8 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-dsa-enveloping.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -166,7 +170,7 @@ public class PhaosTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
// See SANTUARIO-319
@@ -188,7 +192,8 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-hmac-sha1-exclusive-c14n-comments-detached.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the key
byte[] hmacKey = "test".getBytes("ASCII");
@@ -211,7 +216,7 @@ public class PhaosTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -225,7 +230,8 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-hmac-sha1-exclusive-c14n-enveloped.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the key
byte[] hmacKey = "test".getBytes("ASCII");
@@ -248,7 +254,7 @@ public class PhaosTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -257,7 +263,8 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-rsa-detached-b64-transform.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the key
byte[] hmacKey = "test".getBytes("ASCII");
@@ -282,7 +289,7 @@ public class PhaosTest extends Assert {
try {
TestUtils.switchDoNotThrowExceptionForManifests(true);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
} finally {
TestUtils.switchDoNotThrowExceptionForManifests(false);
}
@@ -307,7 +314,8 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-rsa-detached.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -325,7 +333,7 @@ public class PhaosTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -339,7 +347,8 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-rsa-enveloped-bad-digest-val.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -356,7 +365,7 @@ public class PhaosTest extends Assert {
TestSecurityEventListener securityEventListener = new TestSecurityEventListener();
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
try {
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
fail("Failure expected on a bad digest");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
@@ -371,7 +380,8 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-rsa-enveloped.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -389,7 +399,7 @@ public class PhaosTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -398,7 +408,8 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-rsa-enveloping.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -416,7 +427,7 @@ public class PhaosTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
}
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java Wed Jun 6 15:09:42 2018
@@ -22,6 +22,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.TransformerFactory;
@@ -66,7 +67,8 @@ public class RSASecurityTest extends Abs
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/rsasecurity/bdournaee/certj201_enveloping.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -84,7 +86,7 @@ public class RSASecurityTest extends Abs
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, null, null,
@@ -98,7 +100,8 @@ public class RSASecurityTest extends Abs
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/rsasecurity/bdournaee/certj201_enveloped.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -116,7 +119,7 @@ public class RSASecurityTest extends Abs
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, null, null,
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java Wed Jun 6 15:09:42 2018
@@ -98,7 +98,8 @@ public class SignatureCreationReferenceU
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -146,7 +147,8 @@ public class SignatureCreationReferenceU
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -200,7 +202,8 @@ public class SignatureCreationReferenceU
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts(), resolverDirectHTTP);
@@ -244,7 +247,8 @@ public class SignatureCreationReferenceU
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS("http://www.w3.org/2000/09/xmldsig#", "Reference");
Assert.assertEquals(1, nodeList.getLength());
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java Wed Jun 6 15:09:42 2018
@@ -95,8 +95,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
//first child element must be the dsig:Signature @see SANTUARIO-324:
Node childNode = document.getDocumentElement().getFirstChild();
@@ -198,8 +199,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
//first child element must be the dsig:Signature @see SANTUARIO-324:
Node childNode = document.getDocumentElement().getFirstChild();
@@ -260,7 +262,8 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
//first child element must be the dsig:Signature @see SANTUARIO-324:
Node childNode = document.getDocumentElement().getFirstChild();
@@ -347,7 +350,8 @@ public class SignatureCreationTest exten
//System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ Document document
+ = XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
//find first child element:
Node childNode = XMLUtils.getNextElement(document.getDocumentElement().getFirstChild());
@@ -397,7 +401,7 @@ public class SignatureCreationTest exten
// Specify the signature position
properties.setIdAttributeNS(new QName(null, "ID"));
-
+
// Set the key up
KeyStore keyStore = KeyStore.getInstance("jks");
keyStore.load(
@@ -434,13 +438,14 @@ public class SignatureCreationTest exten
//System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ Document document
+ = XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts(),null,true,"ID");
}
-
-
+
+
@Test
public void testMultipleElements() throws Exception {
// Set up the Configuration
@@ -479,8 +484,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -532,8 +538,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
XPathFactory xpf = XPathFactory.newInstance();
@@ -593,8 +600,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -638,8 +646,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -695,8 +704,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -753,8 +763,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -797,8 +808,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -842,8 +854,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_CanonicalizationMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_CanonicalizationMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -907,8 +920,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_CanonicalizationMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_CanonicalizationMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -971,8 +985,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -1016,8 +1031,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_c14nExcl_InclusiveNamespaces.getNamespaceURI(), XMLSecurityConstants.TAG_c14nExcl_InclusiveNamespaces.getLocalPart());
Assert.assertEquals(2, nodeList.getLength());
@@ -1064,8 +1080,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -1116,8 +1133,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -1159,8 +1177,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -1202,8 +1221,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -1247,8 +1267,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -1292,8 +1313,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts(), null, false, "Id");
@@ -1337,8 +1359,9 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_KeyName.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_KeyName.getLocalPart());
assertEquals(1, nodeList.getLength());
@@ -1388,7 +1411,7 @@ public class SignatureCreationTest exten
//System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
Document document =
- XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_KeyName.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_KeyName.getLocalPart());
assertEquals(1, nodeList.getLength());
@@ -1443,7 +1466,7 @@ public class SignatureCreationTest exten
//System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
Document document =
- XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_KeyName.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_KeyName.getLocalPart());
assertEquals(1, nodeList.getLength());
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java Wed Jun 6 15:09:42 2018
@@ -122,8 +122,9 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -174,8 +175,9 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -226,8 +228,9 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -278,8 +281,9 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -330,8 +334,9 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -385,8 +390,9 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -440,8 +446,9 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -495,8 +502,9 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -550,8 +558,9 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -605,8 +614,9 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -660,8 +670,9 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java Wed Jun 6 15:09:42 2018
@@ -30,6 +30,7 @@ import java.security.cert.X509Certificat
import java.util.ArrayList;
import java.util.List;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.TransformerFactory;
@@ -97,7 +98,8 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -136,7 +138,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -145,7 +147,8 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -184,7 +187,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -193,7 +196,8 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -232,7 +236,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -241,7 +245,8 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -280,7 +285,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -289,7 +294,8 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -328,7 +334,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -340,7 +346,8 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -379,7 +386,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -391,7 +398,8 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -430,7 +438,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -442,7 +450,8 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -481,7 +490,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -493,7 +502,8 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -532,7 +542,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -544,7 +554,8 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -583,7 +594,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -595,7 +606,8 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -634,7 +646,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java Wed Jun 6 15:09:42 2018
@@ -97,8 +97,9 @@ public class SignatureEncryptionTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Decrypt using DOM API
Document doc =
@@ -163,8 +164,9 @@ public class SignatureEncryptionTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Decrypt using DOM API
Document doc =
@@ -237,8 +239,9 @@ public class SignatureEncryptionTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Decrypt using DOM API
Document doc =
@@ -311,8 +314,9 @@ public class SignatureEncryptionTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Decrypt using DOM API
Document doc =
@@ -385,8 +389,9 @@ public class SignatureEncryptionTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -485,7 +490,7 @@ public class SignatureEncryptionTest ext
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, testSecurityEventListener);
- Document document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ Document document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// javax.xml.transform.Transformer transformer = TransformerFactory.newInstance().newTransformer();
// transformer.transform(new DOMSource(document), new StreamResult(System.out));
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java Wed Jun 6 15:09:42 2018
@@ -113,8 +113,9 @@ public class SignatureHMACCreationTest e
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()) , false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -155,8 +156,9 @@ public class SignatureHMACCreationTest e
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -197,8 +199,9 @@ public class SignatureHMACCreationTest e
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -239,8 +242,9 @@ public class SignatureHMACCreationTest e
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -281,8 +285,9 @@ public class SignatureHMACCreationTest e
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -326,8 +331,9 @@ public class SignatureHMACCreationTest e
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
- Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
+ Document document =
+ XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());