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 2017/04/26 10:08:37 UTC
svn commit: r1792723 - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/xml/security/c14n/implementations/
test/java/org/apache/xml/security/test/dom/c14n/implementations/
Author: coheigea
Date: Wed Apr 26 10:08:37 2017
New Revision: 1792723
URL: http://svn.apache.org/viewvc?rev=1792723&view=rev
Log:
Consolidated the Canonical XML 1.0 + 1.1 implementations
Removed:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java?rev=1792723&r1=1792722&r2=1792723&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java Wed Apr 26 10:08:37 2017
@@ -22,10 +22,10 @@ import org.apache.xml.security.c14n.Cano
/**
*/
-public class Canonicalizer11_OmitComments extends Canonicalizer11 {
+public class Canonicalizer11_OmitComments extends Canonicalizer20010315 {
public Canonicalizer11_OmitComments() {
- super(false);
+ super(false, true);
}
public final String engineGetURI() {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java?rev=1792723&r1=1792722&r2=1792723&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java Wed Apr 26 10:08:37 2017
@@ -22,10 +22,10 @@ import org.apache.xml.security.c14n.Cano
/**
*/
-public class Canonicalizer11_WithComments extends Canonicalizer11 {
+public class Canonicalizer11_WithComments extends Canonicalizer20010315 {
public Canonicalizer11_WithComments() {
- super(true);
+ super(true, true);
}
public final String engineGetURI() {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java?rev=1792723&r1=1792722&r2=1792723&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java Wed Apr 26 10:08:37 2017
@@ -50,7 +50,8 @@ public abstract class Canonicalizer20010
private boolean firstCall = true;
private final SortedSet<Attr> result = new TreeSet<Attr>(COMPARE);
- private XmlAttrStack xmlattrStack = new XmlAttrStack(false);
+ private final XmlAttrStack xmlattrStack;
+ private final boolean c14n11;
/**
* Constructor Canonicalizer20010315
@@ -58,9 +59,22 @@ public abstract class Canonicalizer20010
* @param includeComments
*/
public Canonicalizer20010315(boolean includeComments) {
+ this(includeComments, false);
+ }
+
+ /**
+ * Constructor Canonicalizer20010315
+ *
+ * @param includeComments
+ * @param c14n11 Whether this is a Canonical XML 1.1 implementation or not
+ */
+ public Canonicalizer20010315(boolean includeComments, boolean c14n11) {
super(includeComments);
+ xmlattrStack = new XmlAttrStack(c14n11);
+ this.c14n11 = c14n11;
}
+
/**
* Always throws a CanonicalizationException because this is inclusive c14n.
*
@@ -208,7 +222,15 @@ public abstract class Canonicalizer20010
if (!XMLNS_URI.equals(NUri)) {
//A non namespace definition node.
if (XML_LANG_URI.equals(NUri)) {
- xmlattrStack.addXmlnsAttr(attribute);
+ if (c14n11 && "id".equals(NName)) {
+ if (isRealVisible) {
+ // treat xml:id like any other attribute
+ // (emit it, but don't inherit it)
+ result.add(attribute);
+ }
+ } else {
+ xmlattrStack.addXmlnsAttr(attribute);
+ }
} else if (isRealVisible) {
//The node is visible add the attribute to the list of output attributes.
result.add(attribute);
@@ -298,7 +320,8 @@ public abstract class Canonicalizer20010
if (!XML.equals(NName) || !Constants.XML_LANG_SPACE_SpecNS.equals(NValue)) {
ns.addMapping(NName, NValue, attribute);
}
- } else if (XML_LANG_URI.equals(attribute.getNamespaceURI())) {
+ } else if (XML_LANG_URI.equals(attribute.getNamespaceURI())
+ && (!c14n11 || c14n11 && !"id".equals(NName))) {
xmlattrStack.addXmlnsAttr(attribute);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java?rev=1792723&r1=1792722&r2=1792723&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java Wed Apr 26 10:08:37 2017
@@ -26,7 +26,6 @@ import javax.xml.parsers.DocumentBuilder
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
-import org.apache.xml.security.c14n.implementations.Canonicalizer11;
import org.apache.xml.security.c14n.implementations.Canonicalizer11_OmitComments;
import org.apache.xml.security.utils.XMLUtils;
@@ -74,7 +73,7 @@ public class Santuario191Test extends or
// Canonicalize the data
//
NodeList dataNodes = doc.getElementsByTagName("data");
- Canonicalizer11 c14ner = new Canonicalizer11_OmitComments();
+ Canonicalizer11_OmitComments c14ner = new Canonicalizer11_OmitComments();
byte[] result = c14ner.engineCanonicalizeSubTree(dataNodes.item(0));
//