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 2020/01/23 12:24:59 UTC
svn commit: r1873063 - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/jcp/xml/dsig/internal/dom/
main/java/org/apache/xml/security/c14n/
main/java/org/apache/xml/security/c14n/implementations/
main/java/org/apache/xml/security/encrypti...
Author: coheigea
Date: Thu Jan 23 12:24:59 2020
New Revision: 1873063
URL: http://svn.apache.org/viewvc?rev=1873063&view=rev
Log:
SANTUARIO-521 - Move secureValidation out of CanonicalizerSpi
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315Excl.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N11.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N11_WithComments.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java Thu Jan 23 12:24:59 2020
@@ -110,8 +110,6 @@ public abstract class ApacheCanonicalize
if (canonicalizer == null) {
try {
canonicalizer = Canonicalizer.getInstance(getAlgorithm());
- boolean secVal = Utils.secureValidation(xc);
- canonicalizer.setSecureValidation(secVal);
LOG.debug("Created canonicalizer for algorithm: {}", getAlgorithm());
} catch (InvalidCanonicalizerException ice) {
throw new TransformException
@@ -123,6 +121,7 @@ public abstract class ApacheCanonicalize
boolean isByteArrayOutputStream = os == null;
OutputStream writer = isByteArrayOutputStream ? new ByteArrayOutputStream() : os;
try {
+ boolean secVal = Utils.secureValidation(xc);
Set<Node> nodeSet = null;
if (data instanceof ApacheData) {
XMLSignatureInput in =
@@ -138,7 +137,7 @@ public abstract class ApacheCanonicalize
} else if (in.isNodeSet()) {
nodeSet = in.getNodeSet();
} else {
- canonicalizer.canonicalize(Utils.readBytesFromStream(in.getOctetStream()), writer);
+ canonicalizer.canonicalize(Utils.readBytesFromStream(in.getOctetStream()), writer, secVal);
return new OctetStreamData(new ByteArrayInputStream(getC14nBytes(writer, isByteArrayOutputStream)));
}
} else if (data instanceof DOMSubTreeData) {
@@ -158,7 +157,7 @@ public abstract class ApacheCanonicalize
nodeSet = ns;
LOG.debug("Canonicalizing {} nodes", nodeSet.size());
} else {
- canonicalizer.canonicalize(Utils.readBytesFromStream(((OctetStreamData)data).getOctetStream()), writer);
+ canonicalizer.canonicalize(Utils.readBytesFromStream(((OctetStreamData)data).getOctetStream()), writer, secVal);
return new OctetStreamData(new ByteArrayInputStream(getC14nBytes(writer, isByteArrayOutputStream)));
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java Thu Jan 23 12:24:59 2020
@@ -60,8 +60,6 @@ public final class DOMCanonicalXMLC14N11
if (subTree.excludeComments()) {
try {
canonicalizer = Canonicalizer.getInstance(C14N_11);
- boolean secVal = Utils.secureValidation(xc);
- canonicalizer.setSecureValidation(secVal);
} catch (InvalidCanonicalizerException ice) {
throw new TransformException
("Couldn't find Canonicalizer for: " +
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java Thu Jan 23 12:24:59 2020
@@ -57,8 +57,6 @@ public final class DOMCanonicalXMLC14NMe
try {
canonicalizer = Canonicalizer.getInstance
(CanonicalizationMethod.INCLUSIVE);
- boolean secVal = Utils.secureValidation(xc);
- canonicalizer.setSecureValidation(secVal);
} catch (InvalidCanonicalizerException ice) {
throw new TransformException
("Couldn't find Canonicalizer for: " +
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java Thu Jan 23 12:24:59 2020
@@ -103,14 +103,14 @@ public final class DOMExcC14NMethod exte
String prefix = DOMUtils.getNSPrefix(context,
CanonicalizationMethod.EXCLUSIVE);
Element eElem = DOMUtils.createElement(ownerDoc,
- "InclusiveNamespaces",
+ "InclusiveNamespaces",
CanonicalizationMethod.EXCLUSIVE,
prefix);
if (prefix == null || prefix.length() == 0) {
eElem.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns",
CanonicalizationMethod.EXCLUSIVE);
} else {
- eElem.setAttributeNS("http://www.w3.org/2000/xmlns/",
+ eElem.setAttributeNS("http://www.w3.org/2000/xmlns/",
"xmlns:" + prefix,
CanonicalizationMethod.EXCLUSIVE);
}
@@ -145,8 +145,6 @@ public final class DOMExcC14NMethod exte
try {
canonicalizer = Canonicalizer.getInstance
(CanonicalizationMethod.EXCLUSIVE);
- boolean secVal = Utils.secureValidation(xc);
- canonicalizer.setSecureValidation(secVal);
} catch (InvalidCanonicalizerException ice) {
throw new TransformException
("Couldn't find Canonicalizer for: " +
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java Thu Jan 23 12:24:59 2020
@@ -91,7 +91,6 @@ public final class Canonicalizer {
new ConcurrentHashMap<>();
private final CanonicalizerSpi canonicalizerSpi;
- private boolean secureValidation;
/**
* Constructor Canonicalizer
@@ -216,23 +215,23 @@ public final class Canonicalizer {
* wrapped with a <CODE>>a<...>/a<</CODE>.
*
* @param inputBytes
- * param writer OutputStream to write the canonicalization result
+ * @param writer OutputStream to write the canonicalization result
+ * @param secureValidation Whether secure validation is enabled
* @throws CanonicalizationException
* @throws java.io.IOException
- * @throws javax.xml.parsers.ParserConfigurationException
* @throws org.xml.sax.SAXException
*/
- public void canonicalize(byte[] inputBytes, OutputStream writer)
+ public void canonicalize(byte[] inputBytes, OutputStream writer, boolean secureValidation)
throws javax.xml.parsers.ParserConfigurationException,
java.io.IOException, org.xml.sax.SAXException, CanonicalizationException {
- canonicalizerSpi.engineCanonicalize(inputBytes, writer);
+ canonicalizerSpi.engineCanonicalize(inputBytes, writer, secureValidation);
}
/**
* Canonicalizes the subtree rooted by <CODE>node</CODE>.
*
* @param node The node to canonicalize
- * param writer OutputStream to write the canonicalization result
+ * @param writer OutputStream to write the canonicalization result
*
* @throws CanonicalizationException
*/
@@ -245,7 +244,7 @@ public final class Canonicalizer {
*
* @param node
* @param inclusiveNamespaces
- * param writer OutputStream to write the canonicalization result
+ * @param writer OutputStream to write the canonicalization result
* @throws CanonicalizationException
*/
public void canonicalizeSubtree(Node node, String inclusiveNamespaces, OutputStream writer)
@@ -258,7 +257,7 @@ public final class Canonicalizer {
*
* @param node
* @param inclusiveNamespaces
- * param writer OutputStream to write the canonicalization result
+ * @param writer OutputStream to write the canonicalization result
* @throws CanonicalizationException
*/
public void canonicalizeSubtree(Node node, String inclusiveNamespaces,
@@ -271,7 +270,7 @@ public final class Canonicalizer {
* Canonicalizes an XPath node set.
*
* @param xpathNodeSet
- * param writer OutputStream to write the canonicalization result
+ * @param writer OutputStream to write the canonicalization result
* @throws CanonicalizationException
*/
public void canonicalizeXPathNodeSet(Set<Node> xpathNodeSet, OutputStream writer)
@@ -284,7 +283,7 @@ public final class Canonicalizer {
*
* @param xpathNodeSet
* @param inclusiveNamespaces
- * param writer OutputStream to write the canonicalization result
+ * @param writer OutputStream to write the canonicalization result
* @throws CanonicalizationException
*/
public void canonicalizeXPathNodeSet(
@@ -293,13 +292,4 @@ public final class Canonicalizer {
canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet, inclusiveNamespaces, writer);
}
- public boolean isSecureValidation() {
- return secureValidation;
- }
-
- public void setSecureValidation(boolean secureValidation) {
- this.secureValidation = secureValidation;
- canonicalizerSpi.secureValidation = secureValidation;
- }
-
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java Thu Jan 23 12:24:59 2020
@@ -32,20 +32,19 @@ import org.w3c.dom.Node;
*/
public abstract class CanonicalizerSpi {
- protected boolean secureValidation;
-
/**
* Method canonicalize
*
* @param inputBytes
* @param writer OutputStream to write the canonicalization result
+ * @param secureValidation Whether secure validation is enabled
*
* @throws CanonicalizationException
* @throws java.io.IOException
* @throws javax.xml.parsers.ParserConfigurationException
* @throws org.xml.sax.SAXException
*/
- public void engineCanonicalize(byte[] inputBytes, OutputStream writer)
+ public void engineCanonicalize(byte[] inputBytes, OutputStream writer, boolean secureValidation)
throws javax.xml.parsers.ParserConfigurationException, java.io.IOException,
org.xml.sax.SAXException, CanonicalizationException {
@@ -124,12 +123,5 @@ public abstract class CanonicalizerSpi {
Node rootNode, String inclusiveNamespaces, boolean propagateDefaultNamespace, OutputStream writer)
throws CanonicalizationException;
- public boolean isSecureValidation() {
- return secureValidation;
- }
-
- public void setSecureValidation(boolean secureValidation) {
- this.secureValidation = secureValidation;
- }
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315Excl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315Excl.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315Excl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315Excl.java Thu Jan 23 12:24:59 2020
@@ -133,13 +133,14 @@ public abstract class Canonicalizer20010
* @param rootNode
* @param inclusiveNamespaces
* @param writer OutputStream to write the canonicalization result
+ * @param secureValidation Whether secure validation is enabled
* @throws CanonicalizationException
*/
public void engineCanonicalize(
- XMLSignatureInput rootNode, String inclusiveNamespaces, OutputStream writer
+ XMLSignatureInput rootNode, String inclusiveNamespaces, OutputStream writer, boolean secureValidation
) throws CanonicalizationException {
inclusiveNSSet = InclusiveNamespaces.prefixStr2Set(inclusiveNamespaces);
- super.engineCanonicalize(rootNode, writer);
+ super.engineCanonicalize(rootNode, writer, secureValidation);
}
/**
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java Thu Jan 23 12:24:59 2020
@@ -128,16 +128,17 @@ public abstract class CanonicalizerBase
* Canonicalizes a Subtree node.
* @param input the root of the subtree to canicalize
* @param writer OutputStream to write the canonicalization result
+ * @param secureValidation Whether secure validation is enabled
*
* @throws CanonicalizationException
*/
- public void engineCanonicalize(XMLSignatureInput input, OutputStream writer) throws CanonicalizationException {
+ public void engineCanonicalize(XMLSignatureInput input, OutputStream writer, boolean secureValidation) throws CanonicalizationException {
try {
if (input.isExcludeComments()) {
includeComments = false;
}
if (input.isOctetStream()) {
- engineCanonicalize(input.getBytes(), writer);
+ engineCanonicalize(input.getBytes(), writer, secureValidation);
}
if (input.isElement()) {
engineCanonicalizeSubTree(input.getSubNode(), input.getExcludeNode(), writer);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java Thu Jan 23 12:24:59 2020
@@ -39,7 +39,7 @@ import org.w3c.dom.NodeList;
*/
public abstract class AbstractSerializer implements Serializer {
- protected Canonicalizer canon;
+ private Canonicalizer canon;
protected boolean secureValidation;
public void setCanonicalizer(Canonicalizer canon) {
@@ -98,7 +98,6 @@ public abstract class AbstractSerializer
*/
public String serialize(NodeList content) throws Exception {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- canon.setSecureValidation(secureValidation);
for (int i = 0; i < content.getLength(); i++) {
canon.canonicalizeSubtree(content.item(i), baos);
}
@@ -119,7 +118,6 @@ public abstract class AbstractSerializer
*/
public byte[] serializeToByteArray(NodeList content) throws Exception {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- canon.setSecureValidation(secureValidation);
for (int i = 0; i < content.getLength(); i++) {
canon.canonicalizeSubtree(content.item(i), baos);
}
@@ -135,7 +133,6 @@ public abstract class AbstractSerializer
*/
public String canonSerialize(Node node) throws Exception {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- canon.setSecureValidation(secureValidation);
canon.canonicalizeSubtree(node, baos);
String ret = baos.toString(StandardCharsets.UTF_8.name());
baos.reset();
@@ -151,7 +148,6 @@ public abstract class AbstractSerializer
*/
public byte[] canonSerializeToByteArray(Node node) throws Exception {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- canon.setSecureValidation(secureValidation);
canon.canonicalizeSubtree(node, baos);
return baos.toByteArray();
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java Thu Jan 23 12:24:59 2020
@@ -280,7 +280,6 @@ public class SignedInfo extends Manifest
// so reparse the SignedInfo to be sure
try {
Canonicalizer c14nizer = Canonicalizer.getInstance(c14nMethodURI);
- c14nizer.setSecureValidation(secureValidation);
byte[] c14nizedBytes = null;
try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
@@ -344,7 +343,6 @@ public class SignedInfo extends Manifest
if (this.c14nizedBytes == null) {
Canonicalizer c14nizer =
Canonicalizer.getInstance(this.getCanonicalizationMethodURI());
- c14nizer.setSecureValidation(isSecureValidation());
String inclusiveNamespaces = this.getInclusiveNamespaces();
try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
@@ -373,7 +371,6 @@ public class SignedInfo extends Manifest
if (this.c14nizedBytes == null) {
Canonicalizer c14nizer =
Canonicalizer.getInstance(this.getCanonicalizationMethodURI());
- c14nizer.setSecureValidation(isSecureValidation());
String inclusiveNamespaces = this.getInclusiveNamespaces();
if (inclusiveNamespaces == null) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java Thu Jan 23 12:24:59 2020
@@ -282,7 +282,7 @@ public class XMLSignatureInput {
}
Canonicalizer20010315OmitComments c14nizer = new Canonicalizer20010315OmitComments();
try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- c14nizer.engineCanonicalize(this, baos);
+ c14nizer.engineCanonicalize(this, baos, secureValidation);
bytes = baos.toByteArray();
}
return bytes;
@@ -501,7 +501,7 @@ public class XMLSignatureInput {
} else {
c14nizer = new Canonicalizer20010315OmitComments();
}
- c14nizer.engineCanonicalize(this, diOs);
+ c14nizer.engineCanonicalize(this, diOs, secureValidation);
} else {
byte[] buffer = new byte[4 * 1024];
int bytesread = 0;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N.java Thu Jan 23 12:24:59 2020
@@ -54,11 +54,10 @@ public class TransformC14N extends Trans
) throws CanonicalizationException {
Canonicalizer20010315OmitComments c14n = new Canonicalizer20010315OmitComments();
- c14n.setSecureValidation(secureValidation);
if (os == null) {
try (ByteArrayOutputStream writer = new ByteArrayOutputStream()) {
- c14n.engineCanonicalize(input, writer);
+ c14n.engineCanonicalize(input, writer, secureValidation);
writer.flush();
XMLSignatureInput output = new XMLSignatureInput(writer.toByteArray());
output.setSecureValidation(secureValidation);
@@ -67,7 +66,7 @@ public class TransformC14N extends Trans
throw new CanonicalizationException("empty", new Object[] {ex.getMessage()});
}
} else {
- c14n.engineCanonicalize(input, os);
+ c14n.engineCanonicalize(input, os, secureValidation);
XMLSignatureInput output = new XMLSignatureInput((byte[])null);
output.setSecureValidation(secureValidation);
output.setOutputStream(os);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N11.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N11.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N11.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N11.java Thu Jan 23 12:24:59 2020
@@ -54,11 +54,10 @@ public class TransformC14N11 extends Tra
) throws CanonicalizationException {
Canonicalizer11_OmitComments c14n = new Canonicalizer11_OmitComments();
- c14n.setSecureValidation(secureValidation);
if (os == null) {
try (ByteArrayOutputStream writer = new ByteArrayOutputStream()) {
- c14n.engineCanonicalize(input, writer);
+ c14n.engineCanonicalize(input, writer, secureValidation);
writer.flush();
XMLSignatureInput output = new XMLSignatureInput(writer.toByteArray());
output.setSecureValidation(secureValidation);
@@ -67,7 +66,7 @@ public class TransformC14N11 extends Tra
throw new CanonicalizationException("empty", new Object[] {ex.getMessage()});
}
} else {
- c14n.engineCanonicalize(input, os);
+ c14n.engineCanonicalize(input, os, secureValidation);
XMLSignatureInput output = new XMLSignatureInput((byte[])null);
output.setSecureValidation(secureValidation);
output.setOutputStream(os);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N11_WithComments.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N11_WithComments.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N11_WithComments.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N11_WithComments.java Thu Jan 23 12:24:59 2020
@@ -54,10 +54,9 @@ public class TransformC14N11_WithComment
) throws CanonicalizationException {
Canonicalizer11_WithComments c14n = new Canonicalizer11_WithComments();
- c14n.setSecureValidation(secureValidation);
if (os == null) {
try (ByteArrayOutputStream writer = new ByteArrayOutputStream()) {
- c14n.engineCanonicalize(input, writer);
+ c14n.engineCanonicalize(input, writer, secureValidation);
writer.flush();
XMLSignatureInput output = new XMLSignatureInput(writer.toByteArray());
output.setSecureValidation(secureValidation);
@@ -66,7 +65,7 @@ public class TransformC14N11_WithComment
throw new CanonicalizationException("empty", new Object[] {ex.getMessage()});
}
} else {
- c14n.engineCanonicalize(input, os);
+ c14n.engineCanonicalize(input, os, secureValidation);
XMLSignatureInput output = new XMLSignatureInput((byte[])null);
output.setSecureValidation(secureValidation);
output.setOutputStream(os);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java Thu Jan 23 12:24:59 2020
@@ -77,11 +77,10 @@ public class TransformC14NExclusive exte
}
Canonicalizer20010315Excl c14n = getCanonicalizer();
- c14n.setSecureValidation(secureValidation);
if (os == null) {
try (ByteArrayOutputStream writer = new ByteArrayOutputStream()) {
- c14n.engineCanonicalize(input, inclusiveNamespaces, writer);
+ c14n.engineCanonicalize(input, inclusiveNamespaces, writer, secureValidation);
writer.flush();
XMLSignatureInput output = new XMLSignatureInput(writer.toByteArray());
output.setSecureValidation(secureValidation);
@@ -90,7 +89,7 @@ public class TransformC14NExclusive exte
throw new CanonicalizationException("empty", new Object[] {ex.getMessage()});
}
} else {
- c14n.engineCanonicalize(input, inclusiveNamespaces, os);
+ c14n.engineCanonicalize(input, inclusiveNamespaces, os, secureValidation);
XMLSignatureInput output = new XMLSignatureInput((byte[])null);
output.setSecureValidation(secureValidation);
output.setOutputStream(os);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java Thu Jan 23 12:24:59 2020
@@ -54,11 +54,10 @@ public class TransformC14NWithComments e
) throws CanonicalizationException {
Canonicalizer20010315WithComments c14n = new Canonicalizer20010315WithComments();
- c14n.setSecureValidation(secureValidation);
if (os == null) {
try (ByteArrayOutputStream writer = new ByteArrayOutputStream()) {
- c14n.engineCanonicalize(input, writer);
+ c14n.engineCanonicalize(input, writer, secureValidation);
writer.flush();
XMLSignatureInput output = new XMLSignatureInput(writer.toByteArray());
output.setSecureValidation(secureValidation);
@@ -67,7 +66,7 @@ public class TransformC14NWithComments e
throw new CanonicalizationException("empty", new Object[] {ex.getMessage()});
}
} else {
- c14n.engineCanonicalize(input, os);
+ c14n.engineCanonicalize(input, os, secureValidation);
XMLSignatureInput output = new XMLSignatureInput((byte[])null);
output.setSecureValidation(secureValidation);
output.setOutputStream(os);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java Thu Jan 23 12:24:59 2020
@@ -257,7 +257,7 @@ public class Canonicalizer20010315Exclus
XMLUtils.getSet(doc.getDocumentElement().getFirstChild(), nodeSet, null, false);
XMLSignatureInput input = new XMLSignatureInput(nodeSet);
try (ByteArrayOutputStream writer = new ByteArrayOutputStream()) {
- c14n.engineCanonicalize(input, "env ns0 xsi wsu", writer);
+ c14n.engineCanonicalize(input, "env ns0 xsi wsu", writer, false);
assertEquals(c14nXML, new String(writer.toByteArray()));
}
}
@@ -356,7 +356,7 @@ public class Canonicalizer20010315Exclus
new Canonicalizer20010315ExclOmitComments();
XMLSignatureInput input = new XMLSignatureInput(doc.getDocumentElement().getFirstChild());
try (ByteArrayOutputStream writer = new ByteArrayOutputStream()) {
- c14n.engineCanonicalize(input, "#default xsi", writer);
+ c14n.engineCanonicalize(input, "#default xsi", writer, false);
assertEquals(c14nXML, new String(writer.toByteArray()));
}
}
@@ -366,7 +366,7 @@ public class Canonicalizer20010315Exclus
new Canonicalizer20010315ExclOmitComments();
XMLSignatureInput input = new XMLSignatureInput(doc.getDocumentElement().getFirstChild());
try (ByteArrayOutputStream writer = new ByteArrayOutputStream()) {
- c14n.engineCanonicalize(input, "xsi", writer);
+ c14n.engineCanonicalize(input, "xsi", writer, false);
assertEquals(c14nXML, new String(writer.toByteArray()));
}
}
@@ -423,7 +423,7 @@ public class Canonicalizer20010315Exclus
new Canonicalizer20010315ExclOmitComments();
XMLSignatureInput input = new XMLSignatureInput(doc.getDocumentElement().getFirstChild());
try (ByteArrayOutputStream writer = new ByteArrayOutputStream()) {
- c14n.engineCanonicalize(input, "#default xsi", writer);
+ c14n.engineCanonicalize(input, "#default xsi", writer, false);
assertEquals(c14nXML1, new String(writer.toByteArray()));
}
}
@@ -432,7 +432,7 @@ public class Canonicalizer20010315Exclus
new Canonicalizer20010315ExclOmitComments();
XMLSignatureInput input = new XMLSignatureInput(doc.getDocumentElement().getFirstChild());
try (ByteArrayOutputStream writer = new ByteArrayOutputStream()) {
- c14n.engineCanonicalize(input, "xsi", writer);
+ c14n.engineCanonicalize(input, "xsi", writer, false);
assertEquals(c14nXML2, new String(writer.toByteArray()));
}
}
@@ -477,7 +477,7 @@ public class Canonicalizer20010315Exclus
new Canonicalizer20010315ExclOmitComments();
XMLSignatureInput input = new XMLSignatureInput(doc.getDocumentElement().getFirstChild());
try (ByteArrayOutputStream writer = new ByteArrayOutputStream()) {
- c14n.engineCanonicalize(input, "#default xsi", writer);
+ c14n.engineCanonicalize(input, "#default xsi", writer, false);
assertEquals(c14nXML, new String(writer.toByteArray()));
}
}
@@ -487,7 +487,7 @@ public class Canonicalizer20010315Exclus
new Canonicalizer20010315ExclOmitComments();
XMLSignatureInput input = new XMLSignatureInput(doc.getDocumentElement().getFirstChild());
try (ByteArrayOutputStream writer = new ByteArrayOutputStream()) {
- c14n.engineCanonicalize(input, "xsi", writer);
+ c14n.engineCanonicalize(input, "xsi", writer, false);
assertEquals(c14nXML, new String(writer.toByteArray()));
}
}
@@ -531,7 +531,7 @@ public class Canonicalizer20010315Exclus
new Canonicalizer20010315ExclOmitComments();
XMLSignatureInput input = new XMLSignatureInput(doc.getDocumentElement().getFirstChild());
try (ByteArrayOutputStream writer = new ByteArrayOutputStream()) {
- c14n.engineCanonicalize(input, "#default xsi", writer);
+ c14n.engineCanonicalize(input, "#default xsi", writer, false);
assertEquals(c14nXML, new String(writer.toByteArray()));
}
}
@@ -541,7 +541,7 @@ public class Canonicalizer20010315Exclus
new Canonicalizer20010315ExclOmitComments();
XMLSignatureInput input = new XMLSignatureInput(doc.getDocumentElement().getFirstChild());
try (ByteArrayOutputStream writer = new ByteArrayOutputStream()) {
- c14n.engineCanonicalize(input, "xsi", writer);
+ c14n.engineCanonicalize(input, "xsi", writer, false);
assertEquals(c14nXML, new String(writer.toByteArray()));
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java?rev=1873063&r1=1873062&r2=1873063&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java Thu Jan 23 12:24:59 2020
@@ -478,7 +478,7 @@ public class Canonicalizer20010315Test {
Canonicalizer c14n =
Canonicalizer.getInstance(Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS);
try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- c14n.canonicalize(utf16, baos);
+ c14n.canonicalize(utf16, baos, true);
InputStream refStream = new FileInputStream(prefix + "/in/testTranslationFromUTF16toUTF8.xml");
byte[] refBytes = JavaUtils.getBytesFromStream(refStream);
boolean equal = java.security.MessageDigest.isEqual(refBytes, baos.toByteArray());