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 [5/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/encryption/SymmetricEncryptionVerificationTest.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/encryption/SymmetricEncryptionVerificationTest.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/encryption/SymmetricEncryptionVerificationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java Wed Jun 6 15:09:42 2018
@@ -31,6 +31,7 @@ import java.util.List;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.TransformerFactory;
@@ -109,7 +110,8 @@ public class SymmetricEncryptionVerifica
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
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -145,7 +147,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -158,7 +160,8 @@ public class SymmetricEncryptionVerifica
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
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -194,7 +197,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -207,7 +210,8 @@ public class SymmetricEncryptionVerifica
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
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -243,7 +247,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -256,7 +260,8 @@ public class SymmetricEncryptionVerifica
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
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -292,7 +297,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -305,7 +310,8 @@ public class SymmetricEncryptionVerifica
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
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -341,7 +347,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -354,7 +360,8 @@ public class SymmetricEncryptionVerifica
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
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -390,7 +397,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -403,7 +410,8 @@ public class SymmetricEncryptionVerifica
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
KeyGenerator keygen = KeyGenerator.getInstance("DESede");
@@ -438,7 +446,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -454,7 +462,8 @@ public class SymmetricEncryptionVerifica
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
KeyGenerator keygen = KeyGenerator.getInstance("SEED");
@@ -490,7 +499,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -506,7 +515,8 @@ public class SymmetricEncryptionVerifica
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
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -542,7 +552,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -558,7 +568,8 @@ public class SymmetricEncryptionVerifica
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
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -594,7 +605,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -610,7 +621,8 @@ public class SymmetricEncryptionVerifica
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
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -646,7 +658,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.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/encryption/XMLEncryption11Test.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/encryption/XMLEncryption11Test.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java Wed Jun 6 15:09:42 2018
@@ -38,6 +38,7 @@ import javax.crypto.BadPaddingException;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -111,7 +112,8 @@ public class XMLEncryption11Test extends
xmlInputFactory.setEventAllocator(new XMLSecEventAllocator());
String filename = "org/w3c/www/interop/xmlenc-core-11/plaintext.xml";
- Document doc = XMLUtils.parse(this.getClass().getClassLoader().getResourceAsStream(filename), false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(this.getClass().getClassLoader().getResourceAsStream(filename));
cardNumber = retrieveCCNumber(doc);
nodeCount = countNodes(doc);
@@ -450,7 +452,8 @@ public class XMLEncryption11Test extends
* decrypt it and return the resulting document
*/
private Document decryptElement(String filename, Key rsaKey) throws Exception {
- Document doc = XMLUtils.parse(this.getClass().getClassLoader().getResourceAsStream(filename), false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(this.getClass().getClassLoader().getResourceAsStream(filename));
return decryptElement(doc, rsaKey);
}
@@ -482,7 +485,7 @@ public class XMLEncryption11Test extends
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- return StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ return StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
/**
@@ -553,7 +556,8 @@ public class XMLEncryption11Test extends
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("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.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/performance/AbstractPerformanceTest.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/performance/AbstractPerformanceTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.java Wed Jun 6 15:09:42 2018
@@ -33,6 +33,7 @@ import org.w3c.dom.Element;
import javax.crypto.KeyGenerator;
import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
@@ -224,7 +225,8 @@ public abstract class AbstractPerformanc
protected void doDOMSignatureOutbound(File file, int tagCount) throws Exception {
- Document document = XMLUtils.parse(new FileInputStream(file), false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(file);
XMLSignature sig = new XMLSignature(document, "", "http://www.w3.org/2000/09/xmldsig#rsa-sha1");
Element root = document.getDocumentElement();
@@ -243,7 +245,8 @@ public abstract class AbstractPerformanc
protected void doDOMSignatureInbound(File file, int tagCount) throws Exception {
- Document document = XMLUtils.parse(new FileInputStream(file), false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(file);
Element signatureElement = (Element) document.getElementsByTagNameNS("http://www.w3.org/2000/09/xmldsig#", "Signature").item(0);
((Element) signatureElement.getParentNode()).setIdAttributeNS(null, "Id", true);
@@ -284,7 +287,8 @@ public abstract class AbstractPerformanc
protected void doDOMEncryptionOutbound(File file, int tagCount) throws Exception {
- Document document = XMLUtils.parse(new FileInputStream(file), false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(file);
XMLCipher cipher = XMLCipher.getInstance("http://www.w3.org/2001/04/xmlenc#aes256-cbc");
cipher.init(XMLCipher.ENCRYPT_MODE, encryptionSymKey);
@@ -295,7 +299,8 @@ public abstract class AbstractPerformanc
protected void doDOMDecryptionInbound(File file, int tagCount) throws Exception {
- Document document = XMLUtils.parse(new FileInputStream(file), false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(file);
XMLCipher cipher = XMLCipher.getInstance("http://www.w3.org/2001/04/xmlenc#aes256-cbc");
cipher.init(XMLCipher.DECRYPT_MODE, encryptionSymKey);
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.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/BaltimoreTest.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/BaltimoreTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java Wed Jun 6 15:09:42 2018
@@ -37,6 +37,7 @@ import java.security.spec.RSAPublicKeySp
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;
@@ -123,7 +124,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloping-hmac-sha1.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -146,7 +148,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, key,
@@ -159,7 +161,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloping-hmac-sha1-40.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -181,7 +184,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
try {
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
fail("Failure expected on a short HMAC length");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
@@ -196,7 +199,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloped-dsa.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -214,7 +218,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -227,7 +231,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloping-b64-dsa.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -245,7 +250,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -258,7 +263,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloping-dsa.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -276,7 +282,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -289,7 +295,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloping-rsa.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -307,7 +314,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA", 15),
@@ -332,7 +339,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-external-b64-dsa.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
Key publicKey = getPublicKey("DSA", 15);
@@ -354,7 +362,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -384,7 +392,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-external-dsa.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
Key publicKey = getPublicKey("DSA", 15);
@@ -406,7 +415,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -423,7 +432,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -446,7 +456,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, key,
@@ -459,7 +469,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -481,7 +492,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
try {
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
fail("Failure expected on a short HMAC length");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
@@ -496,7 +507,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloped-dsa.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
Key publicKey = getPublicKey("DSA", 23);
@@ -518,7 +530,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 23),
@@ -531,7 +543,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-b64-dsa.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
Key publicKey = getPublicKey("DSA", 23);
@@ -553,7 +566,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 23),
@@ -566,7 +579,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-dsa.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -584,7 +598,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 23),
@@ -597,7 +611,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-rsa.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -615,7 +630,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA", 23),
@@ -641,7 +656,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-external-b64-dsa.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
Key publicKey = getPublicKey("DSA", 23);
@@ -663,7 +679,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA", 23),
@@ -693,7 +709,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-external-dsa.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
Key publicKey = getPublicKey("DSA", 23);
@@ -715,7 +732,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA", 23),
@@ -745,7 +762,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-keyname.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
CertificateFactory cf = CertificateFactory.getInstance("X509");
@@ -772,7 +790,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -802,7 +820,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-retrievalmethod-rawx509crt.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
CertificateFactory cf = CertificateFactory.getInstance("X509");
@@ -827,7 +846,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -853,7 +872,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-x509-crt-crl.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -869,7 +889,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -895,7 +915,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-x509-crt.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -911,7 +932,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -937,7 +958,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-x509-is.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -964,7 +986,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -994,7 +1016,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-x509-ski.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -1019,7 +1042,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1045,7 +1068,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-x509-sn.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -1072,7 +1096,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -1089,7 +1113,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-exc-c14n-one/exc-signature.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -1105,7 +1130,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -1126,7 +1151,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-keyname.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
CertificateFactory cf = CertificateFactory.getInstance("X509");
@@ -1153,7 +1179,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -1183,7 +1209,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-retrievalmethod-rawx509crt.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
CertificateFactory cf = CertificateFactory.getInstance("X509");
@@ -1208,7 +1235,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1234,7 +1261,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-x509-crt-crl.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -1250,7 +1278,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1276,7 +1304,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-x509-crt.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -1292,7 +1321,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1318,7 +1347,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-x509-is.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -1345,7 +1375,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -1375,7 +1405,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-x509-ski.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -1400,7 +1431,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1426,7 +1457,8 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-x509-sn.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -1453,7 +1485,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.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/IAIKTest.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/IAIKTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java Wed Jun 6 15:09:42 2018
@@ -33,6 +33,7 @@ import java.security.spec.RSAPublicKeySp
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;
@@ -106,7 +107,8 @@ public class IAIKTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"at/iaik/ixsil/signatureAlgorithms/signatures/hMACSignature.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -129,7 +131,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, key, SecurityTokenConstants.KeyIdentifier_NoKeyInfo);
@@ -141,7 +143,8 @@ public class IAIKTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"at/iaik/ixsil/signatureAlgorithms/signatures/hMACShortSignature.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -163,7 +166,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
try {
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
fail("Failure expected on a short HMAC length");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
@@ -177,7 +180,8 @@ public class IAIKTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"at/iaik/ixsil/signatureAlgorithms/signatures/dSASignature.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -195,7 +199,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA"),
@@ -208,7 +212,8 @@ public class IAIKTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"at/iaik/ixsil/signatureAlgorithms/signatures/rSASignature.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -226,7 +231,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA"),
@@ -257,7 +262,7 @@ public class IAIKTest extends Assert {
try {
TestUtils.switchAllowNotSameDocumentReferences(true);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
}
@@ -291,7 +296,7 @@ public class IAIKTest extends Assert {
try {
TestUtils.switchAllowNotSameDocumentReferences(true);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
}
@@ -307,7 +312,8 @@ public class IAIKTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"at/iaik/ixsil/transforms/signatures/envelopedSignatureSignature.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
Key publicKey = getPublicKey("RSA");
@@ -329,7 +335,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA"),
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.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/PKSignatureCreationTest.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/PKSignatureCreationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java Wed Jun 6 15:09:42 2018
@@ -119,8 +119,9 @@ public class PKSignatureCreationTest 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, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -159,8 +160,9 @@ public class PKSignatureCreationTest 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, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -199,8 +201,9 @@ public class PKSignatureCreationTest 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, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -239,8 +242,9 @@ public class PKSignatureCreationTest 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, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -282,8 +286,9 @@ public class PKSignatureCreationTest 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, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -325,8 +330,9 @@ public class PKSignatureCreationTest 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, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -368,8 +374,9 @@ public class PKSignatureCreationTest 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, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -411,8 +418,9 @@ public class PKSignatureCreationTest 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, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -454,8 +462,9 @@ public class PKSignatureCreationTest 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, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -497,8 +506,9 @@ public class PKSignatureCreationTest 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, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -537,8 +547,9 @@ public class PKSignatureCreationTest 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, ecKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -577,8 +588,9 @@ public class PKSignatureCreationTest 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, ecKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -617,8 +629,9 @@ public class PKSignatureCreationTest 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, ecKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -657,8 +670,9 @@ public class PKSignatureCreationTest 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, ecKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -697,8 +711,9 @@ public class PKSignatureCreationTest 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, ecKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -740,8 +755,9 @@ public class PKSignatureCreationTest 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, ecKeyPair.getPublic(), properties.getSignatureSecureParts());