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 2011/04/29 12:57:55 UTC
svn commit: r1097764 - in /santuario/xml-security-java/branches/1.4.x-fixes:
data/org/apache/xml/security/c14n/in/
src_unitTests/org/apache/xml/security/test/
src_unitTests/org/apache/xml/security/test/c14n/implementations/
Author: coheigea
Date: Fri Apr 29 10:57:54 2011
New Revision: 1097764
URL: http://svn.apache.org/viewvc?rev=1097764&view=rev
Log:
Added some unit tests for the Canonicalizer11
Added:
santuario/xml-security-java/branches/1.4.x-fixes/data/org/apache/xml/security/c14n/in/38_c14n.xml
santuario/xml-security-java/branches/1.4.x-fixes/data/org/apache/xml/security/c14n/in/38_input.xml
santuario/xml-security-java/branches/1.4.x-fixes/src_unitTests/org/apache/xml/security/test/c14n/implementations/Canonicalizer11Test.java
Modified:
santuario/xml-security-java/branches/1.4.x-fixes/src_unitTests/org/apache/xml/security/test/ModuleTest.java
Added: santuario/xml-security-java/branches/1.4.x-fixes/data/org/apache/xml/security/c14n/in/38_c14n.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/1.4.x-fixes/data/org/apache/xml/security/c14n/in/38_c14n.xml?rev=1097764&view=auto
==============================================================================
--- santuario/xml-security-java/branches/1.4.x-fixes/data/org/apache/xml/security/c14n/in/38_c14n.xml (added)
+++ santuario/xml-security-java/branches/1.4.x-fixes/data/org/apache/xml/security/c14n/in/38_c14n.xml Fri Apr 29 10:57:54 2011
@@ -0,0 +1 @@
+<e1 xmlns="http://www.ietf.org" xmlns:w3c="http://www.w3.org" xml:base="something/else"><e3 xmlns="" id="E3" xml:base="bar/foo" xml:space="preserve"></e3></e1>
\ No newline at end of file
Added: santuario/xml-security-java/branches/1.4.x-fixes/data/org/apache/xml/security/c14n/in/38_input.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/1.4.x-fixes/data/org/apache/xml/security/c14n/in/38_input.xml?rev=1097764&view=auto
==============================================================================
--- santuario/xml-security-java/branches/1.4.x-fixes/data/org/apache/xml/security/c14n/in/38_input.xml (added)
+++ santuario/xml-security-java/branches/1.4.x-fixes/data/org/apache/xml/security/c14n/in/38_input.xml Fri Apr 29 10:57:54 2011
@@ -0,0 +1,11 @@
+<!DOCTYPE doc [
+<!ATTLIST e2 xml:space (default|preserve) 'preserve'>
+<!ATTLIST e3 id ID #IMPLIED>
+]>
+<doc xmlns="http://www.ietf.org" xmlns:w3c="http://www.w3.org" xml:base="something/else">
+ <e1>
+ <e2 xmlns="" xml:id="abc" xml:base="bar/">
+ <e3 id="E3" xml:base="foo"/>
+ </e2>
+ </e1>
+</doc>
Modified: santuario/xml-security-java/branches/1.4.x-fixes/src_unitTests/org/apache/xml/security/test/ModuleTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/1.4.x-fixes/src_unitTests/org/apache/xml/security/test/ModuleTest.java?rev=1097764&r1=1097763&r2=1097764&view=diff
==============================================================================
--- santuario/xml-security-java/branches/1.4.x-fixes/src_unitTests/org/apache/xml/security/test/ModuleTest.java (original)
+++ santuario/xml-security-java/branches/1.4.x-fixes/src_unitTests/org/apache/xml/security/test/ModuleTest.java Fri Apr 29 10:57:54 2011
@@ -48,6 +48,7 @@ public class ModuleTest extends TestCase
suite.addTest(org.apache.xml.security.test.c14n.implementations.Canonicalizer20010315Test.suite());
suite.addTest(org.apache.xml.security.test.c14n.implementations.Canonicalizer20010315ExclusiveTest.suite());
suite.addTest(org.apache.xml.security.test.c14n.implementations.ExclusiveC14NInterop.suite());
+ suite.addTest(org.apache.xml.security.test.c14n.implementations.Canonicalizer11Test.suite());
suite.addTest(org.apache.xml.security.test.c14n.implementations.Bug45961Test.suite());
suite.addTest(org.apache.xml.security.test.c14n.implementations.Santuario191Test.suite());
suite.addTest(org.apache.xml.security.test.external.org.apache.xalan.XPathAPI.XalanBug1425Test.suite());
Added: santuario/xml-security-java/branches/1.4.x-fixes/src_unitTests/org/apache/xml/security/test/c14n/implementations/Canonicalizer11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/1.4.x-fixes/src_unitTests/org/apache/xml/security/test/c14n/implementations/Canonicalizer11Test.java?rev=1097764&view=auto
==============================================================================
--- santuario/xml-security-java/branches/1.4.x-fixes/src_unitTests/org/apache/xml/security/test/c14n/implementations/Canonicalizer11Test.java (added)
+++ santuario/xml-security-java/branches/1.4.x-fixes/src_unitTests/org/apache/xml/security/test/c14n/implementations/Canonicalizer11Test.java Fri Apr 29 10:57:54 2011
@@ -0,0 +1,421 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.xml.security.test.c14n.implementations;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.xml.security.c14n.CanonicalizationException;
+import org.apache.xml.security.c14n.Canonicalizer;
+import org.apache.xml.security.c14n.InvalidCanonicalizerException;
+import org.apache.xml.security.utils.Constants;
+import org.apache.xml.security.utils.IgnoreAllErrorHandler;
+import org.apache.xml.security.utils.JavaUtils;
+import org.apache.xml.security.utils.XMLUtils;
+import org.apache.xpath.CachedXPathAPI;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+import org.xml.sax.SAXException;
+
+/**
+ * Unit test for
+ * {@link org.apache.xml.security.c14n.implementations.Canonicalizer11}
+ */
+public class Canonicalizer11Test extends TestCase {
+
+ /** {@link org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(Canonicalizer11Test.class.getName());
+
+ static {
+ org.apache.xml.security.Init.init();
+ }
+
+ /** Field prefix */
+ private String prefix;
+
+ public static Test suite() {
+ return new TestSuite(Canonicalizer11Test.class);
+ }
+
+ public Canonicalizer11Test() {
+ prefix = "data/org/apache/xml/security/c14n/";
+ String basedir = System.getProperty("basedir");
+ if (basedir != null && !"".equals(basedir)) {
+ prefix = basedir + "/" + prefix;
+ }
+ }
+
+ /**
+ * 3.1 PIs, Comments, and Outside of Document Element
+ *
+ * @throws CanonicalizationException
+ * @throws FileNotFoundException
+ * @throws IOException
+ * @throws InvalidCanonicalizerException
+ * @throws ParserConfigurationException
+ * @throws SAXException
+ * @throws TransformerException
+ * @throws XPathExpressionException
+ */
+ public void test31withCommentsSubtree()
+ throws IOException, FileNotFoundException, SAXException,
+ ParserConfigurationException, CanonicalizationException,
+ InvalidCanonicalizerException, TransformerException {
+ String descri =
+ "3.1: PIs, Comments, and Outside of Document Element. (commented)";
+
+ String fileIn = prefix + "in/31_input.xml";
+ String fileRef = prefix + "in/31_c14n-comments.xml";
+ String fileOut = prefix + "out/xpath_31_output-comments.xml";
+ String c14nURI = Canonicalizer.ALGO_ID_C14N11_WITH_COMMENTS;
+ boolean validating = true;
+ String xpath = null;
+
+ assertTrue(descri,
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ }
+
+ /**
+ * 3.2 Whitespace in Document Content
+ *
+ * @throws CanonicalizationException
+ * @throws FileNotFoundException
+ * @throws IOException
+ * @throws InvalidCanonicalizerException
+ * @throws ParserConfigurationException
+ * @throws SAXException
+ * @see <A HREF="http://www.w3.org/TR/2001/PR-xml-c14n-20010119#Example-WhitespaceInContent">the example from the spec</A>
+ * @throws TransformerException
+ * @throws XPathExpressionException
+ */
+ public void test32subtree()
+ throws IOException, FileNotFoundException, SAXException,
+ ParserConfigurationException, CanonicalizationException,
+ InvalidCanonicalizerException, TransformerException {
+ String descri = "3.2 Whitespace in Document Content. (uncommented)";
+ String fileIn = prefix + "in/32_input.xml";
+ String fileRef = prefix + "in/32_c14n.xml";
+ String fileOut = prefix + "out/xpath_32_output.xml";
+ String c14nURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
+ boolean validating = true;
+ String xpath = null;
+
+ assertTrue(descri,
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ }
+
+ /**
+ * 3.3 Start and End Tags
+ *
+ * @throws CanonicalizationException
+ * @throws FileNotFoundException
+ * @throws IOException
+ * @throws InvalidCanonicalizerException
+ * @throws ParserConfigurationException
+ * @throws SAXException
+ * @see <A HREF="http://www.w3.org/TR/2001/PR-xml-c14n-20010119#Example-SETags">the example from the spec</A>
+ * @throws TransformerException
+ * @throws XPathExpressionException
+ */
+ public void test33subtree()
+ throws IOException, FileNotFoundException, SAXException,
+ ParserConfigurationException, CanonicalizationException,
+ InvalidCanonicalizerException, TransformerException {
+ String descri = "3.3 Start and End Tags. (uncommented)";
+ String fileIn = prefix + "in/33_input.xml";
+ String fileRef = prefix + "in/33_c14n.xml";
+ String fileOut = prefix + "out/xpath_33_output.xml";
+ String c14nURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
+ boolean validating = true;
+ String xpath = null; // Canonicalizer.XPATH_C14N_OMIT_COMMENTS_SINGLE_NODE;
+
+ assertTrue(descri,
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ }
+
+ /**
+ * 3.4 Character Modifications and Character References
+ *
+ * @throws CanonicalizationException
+ * @throws FileNotFoundException
+ * @throws IOException
+ * @throws InvalidCanonicalizerException
+ * @throws ParserConfigurationException
+ * @throws SAXException
+ * @see #test34validatingParser
+ * @see <A HREF="http://www.w3.org/TR/2001/PR-xml-c14n-20010119#Example-Chars">the example from the spec</A>
+ * @throws TransformerException
+ * @throws XPathExpressionException
+ */
+ public void test34()
+ throws IOException, FileNotFoundException, SAXException,
+ ParserConfigurationException, CanonicalizationException,
+ InvalidCanonicalizerException, TransformerException {
+ String descri =
+ "3.4 Character Modifications and Character References. (uncommented)";
+ String fileIn = prefix + "in/34_input.xml";
+ String fileRef = prefix + "in/34_c14n.xml";
+ String fileOut = prefix + "out/xpath_34_output.xml";
+ String c14nURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
+ boolean validating = false;
+ String xpath = null;
+
+ assertTrue(descri,
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ }
+
+ /**
+ * 3.5 Entity References
+ *
+ * @throws CanonicalizationException
+ * @throws FileNotFoundException
+ * @throws IOException
+ * @throws InvalidCanonicalizerException
+ * @throws ParserConfigurationException
+ * @throws SAXException
+ * @see <A HREF="http://www.w3.org/TR/2001/PR-xml-c14n-20010119#Example-Entities">the example from the spec</A>
+ * @throws TransformerException
+ * @throws XPathExpressionException
+ */
+ public void test35subtree()
+ throws IOException, FileNotFoundException, SAXException,
+ ParserConfigurationException, CanonicalizationException,
+ InvalidCanonicalizerException, TransformerException {
+ String descri = "3.5 Entity References. (uncommented)";
+ String fileIn = prefix + "in/35_input.xml";
+ String fileRef = prefix + "in/35_c14n.xml";
+ String fileOut = prefix + "out/xpath_35_output.xml";
+ String c14nURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
+ boolean validating = true;
+ String xpath = null;
+
+ assertTrue(descri,
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ }
+
+ /**
+ * 3.6 UTF-8 Encoding
+ *
+ * @throws CanonicalizationException
+ * @throws FileNotFoundException
+ * @throws IOException
+ * @throws InvalidCanonicalizerException
+ * @throws ParserConfigurationException
+ * @throws SAXException
+ * @see <A HREF="http://www.w3.org/TR/2001/PR-xml-c14n-20010119#Example-UTF8">the example from the spec</A>
+ * @throws TransformerException
+ * @throws XPathExpressionException
+ */
+ public void test36subtree()
+ throws IOException, FileNotFoundException, SAXException,
+ ParserConfigurationException, CanonicalizationException,
+ InvalidCanonicalizerException, TransformerException {
+ String descri = "3.6 UTF-8 Encoding. (uncommented)";
+ String fileIn = prefix + "in/36_input.xml";
+ String fileRef = prefix + "in/36_c14n.xml";
+ String fileOut = prefix + "out/xpath_36_output.xml";
+ String c14nURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
+ boolean validating = true;
+ String xpath = null;
+
+ assertTrue(descri,
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ }
+
+ /**
+ * 3.7 Document Subsets
+ *
+ * @throws CanonicalizationException
+ * @throws FileNotFoundException
+ * @throws IOException
+ * @throws InvalidCanonicalizerException
+ * @throws ParserConfigurationException
+ * @throws SAXException
+ * @see <A HREF="http://www.w3.org/TR/2001/PR-xml-c14n-20010119#Example-DocSubsets">the example from the spec</A>
+ * @throws TransformerException
+ * @throws XPathExpressionException
+ */
+ public void test37()
+ throws IOException, FileNotFoundException, SAXException,
+ ParserConfigurationException, CanonicalizationException,
+ InvalidCanonicalizerException, TransformerException {
+ String descri = "3.7 Document Subsets. (uncommented)";
+ String fileIn = prefix + "in/37_input.xml";
+ String fileRef = prefix + "in/37_c14n.xml";
+ String fileOut = prefix + "out/xpath_37_output.xml";
+ String c14nURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
+ boolean validating = true;
+ Element xpath = null;
+ DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+
+ dfactory.setNamespaceAware(true);
+
+ DocumentBuilder db = dfactory.newDocumentBuilder();
+ Document doc = db.newDocument();
+
+ xpath = XMLUtils.createElementInSignatureSpace(doc, Constants._TAG_XPATH);
+
+ xpath.setAttributeNS(Constants.NamespaceSpecNS, "xmlns:ietf", "http://www.ietf.org");
+
+ String xpathFromSpec =
+ "(//. | //@* | //namespace::*)"
+ + "[ "
+ + "self::ietf:e1 or "
+ + "(parent::ietf:e1 and not(self::text() or self::e2)) or "
+ + "count(id(\"E3\")|ancestor-or-self::node()) = count(ancestor-or-self::node()) "
+ + "]";
+ xpath.appendChild(doc.createTextNode(xpathFromSpec));
+
+ assertTrue(descri,
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ }
+
+ /**
+ * 3.8 Document Subsets and XML Attributes
+ *
+ * @throws CanonicalizationException
+ * @throws FileNotFoundException
+ * @throws IOException
+ * @throws InvalidCanonicalizerException
+ * @throws ParserConfigurationException
+ * @throws SAXException
+ * @throws TransformerException
+ * @throws XPathExpressionException
+ */
+ public void test38()
+ throws IOException, FileNotFoundException, SAXException,
+ ParserConfigurationException, CanonicalizationException,
+ InvalidCanonicalizerException, TransformerException {
+ String descri = "3.8 Document Subsets and XML Attributes (uncommented)";
+ String fileIn = prefix + "in/38_input.xml";
+ String fileRef = prefix + "in/38_c14n.xml";
+ String fileOut = prefix + "out/xpath_38_output.xml";
+ String c14nURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
+ boolean validating = true;
+ Element xpath = null;
+ DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+
+ dfactory.setNamespaceAware(true);
+
+ DocumentBuilder db = dfactory.newDocumentBuilder();
+ Document doc = db.newDocument();
+
+ xpath = XMLUtils.createElementInSignatureSpace(doc, Constants._TAG_XPATH);
+
+ xpath.setAttributeNS(Constants.NamespaceSpecNS, "xmlns:ietf", "http://www.ietf.org");
+ String xpathFromSpec =
+ "(//. | //@* | //namespace::*)"
+ + "[ "
+ + "self::ietf:e1 or "
+ + "(parent::ietf:e1 and not(self::text() or self::e2)) or "
+ + "count(id(\"E3\")|ancestor-or-self::node()) = count(ancestor-or-self::node()) "
+ + "]";
+ xpath.appendChild(doc.createTextNode(xpathFromSpec));
+
+ assertTrue(descri,
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ }
+
+ private boolean c14nAndCompare(
+ String fileIn,
+ String fileRef,
+ String fileOut,
+ String c14nURI,
+ boolean validating,
+ Object xpath
+ ) throws IOException, FileNotFoundException, SAXException,
+ ParserConfigurationException, CanonicalizationException,
+ InvalidCanonicalizerException, TransformerException {
+ DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+
+ dfactory.setNamespaceAware(true);
+ dfactory.setValidating(validating);
+
+ DocumentBuilder documentBuilder = dfactory.newDocumentBuilder();
+
+ // throw away all warnings and errors
+ documentBuilder.setErrorHandler(new IgnoreAllErrorHandler());
+
+ // org.xml.sax.EntityResolver resolver = new TestVectorResolver();
+ // documentBuilder.setEntityResolver(resolver);
+ // Document doc = documentBuilder.parse(resolver.resolveEntity(null, fileIn));
+
+ Document doc = documentBuilder.parse(fileIn);
+
+
+ Canonicalizer c14n = Canonicalizer.getInstance(c14nURI);
+ byte c14nBytes[] = null;
+
+ if (xpath == null) {
+ c14nBytes = c14n.canonicalizeSubtree(doc);
+ } else {
+ CachedXPathAPI xpathAPI = new CachedXPathAPI();
+ NodeList nl = null;
+
+ if (xpath instanceof String) {
+ nl = xpathAPI.selectNodeList(doc, (String) xpath);
+ } else {
+ Element xpathElement = (Element) xpath;
+ String xpathStr = ((Text) xpathElement.getFirstChild()).getData();
+
+ nl = xpathAPI.selectNodeList(doc, xpathStr, xpathElement);
+ }
+
+ c14nBytes = c14n.canonicalizeXPathNodeSet(nl);
+ }
+
+ // org.xml.sax.InputSource refIs = resolver.resolveEntity(null, fileRef);
+ // byte refBytes[] = JavaUtils.getBytesFromStream(refIs.getByteStream());
+ byte refBytes[] = JavaUtils.getBytesFromFile(fileRef);
+
+ // if everything is OK, result is true; we do a binary compare, byte by byte
+ boolean result = java.security.MessageDigest.isEqual(refBytes, c14nBytes);
+
+ if (result == false) {
+ File f = new File(fileOut);
+ if (!f.exists()) {
+ File parent = new File(f.getParent());
+ parent.mkdirs();
+ f.createNewFile();
+ }
+ FileOutputStream fos = new FileOutputStream(f);
+
+ fos.write(c14nBytes);
+ log.debug("Wrote errorneous result to file " + f.toURI().toURL().toString());
+ assertEquals(new String(refBytes),new String(c14nBytes));
+ }
+
+ return result;
+ }
+
+}