You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2015/12/07 22:49:17 UTC
svn commit: r1718477 - in /xerces/java/trunk/tests/jaxp:
JAXPSecureProcessingTest.java data/gEntitySP11.xml data/pEntitySP11.xml
Author: mrglavas
Date: Mon Dec 7 21:49:17 2015
New Revision: 1718477
URL: http://svn.apache.org/viewvc?rev=1718477&view=rev
Log:
Adding several tests for XML 1.1 documents.
Added:
xerces/java/trunk/tests/jaxp/data/gEntitySP11.xml (with props)
xerces/java/trunk/tests/jaxp/data/pEntitySP11.xml (with props)
Modified:
xerces/java/trunk/tests/jaxp/JAXPSecureProcessingTest.java
Modified: xerces/java/trunk/tests/jaxp/JAXPSecureProcessingTest.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/tests/jaxp/JAXPSecureProcessingTest.java?rev=1718477&r1=1718476&r2=1718477&view=diff
==============================================================================
--- xerces/java/trunk/tests/jaxp/JAXPSecureProcessingTest.java (original)
+++ xerces/java/trunk/tests/jaxp/JAXPSecureProcessingTest.java Mon Dec 7 21:49:17 2015
@@ -285,6 +285,18 @@ public class JAXPSecureProcessingTest ex
}
}
+ public void testSAXEntitySizeLimitSG11() throws Exception {
+ System.setProperty(MAX_GENERAL_ENTITY_SIZE_LIMIT_PROPERTY_NAME, "1");
+ XMLReader reader = newSecureXMLReader();
+ try {
+ reader.parse(new InputData("gEntitySP11.xml"));
+ fail("Expected SAXParseException");
+ }
+ catch (SAXParseException se) {
+ assertTrue(se.getMessage().indexOf("\"1\"") != -1);
+ }
+ }
+
public void testSAXEntitySizeLimitSP() throws Exception {
System.setProperty(MAX_PARAMETER_ENTITY_SIZE_LIMIT_PROPERTY_NAME, "10000");
XMLReader reader = newSecureXMLReader();
@@ -297,6 +309,18 @@ public class JAXPSecureProcessingTest ex
}
}
+ public void testSAXEntitySizeLimitSP11() throws Exception {
+ System.setProperty(MAX_PARAMETER_ENTITY_SIZE_LIMIT_PROPERTY_NAME, "10000");
+ XMLReader reader = newSecureXMLReader();
+ try {
+ reader.parse(new InputData("pEntitySP11.xml"));
+ fail("Expected SAXParseException");
+ }
+ catch (SAXParseException se) {
+ assertTrue(se.getMessage().indexOf("\"10,000\"") != -1);
+ }
+ }
+
public void testSAXEntitySizeLimitDG() throws Exception {
System.setProperty(MAX_GENERAL_ENTITY_SIZE_LIMIT_PROPERTY_NAME, "2");
XMLReader reader = newDefaultXMLReader();
@@ -309,6 +333,18 @@ public class JAXPSecureProcessingTest ex
}
}
+ public void testSAXEntitySizeLimitDG11() throws Exception {
+ System.setProperty(MAX_GENERAL_ENTITY_SIZE_LIMIT_PROPERTY_NAME, "2");
+ XMLReader reader = newDefaultXMLReader();
+ try {
+ reader.parse(new InputData("gEntitySP11.xml"));
+ fail("Expected SAXParseException");
+ }
+ catch (SAXParseException se) {
+ assertTrue(se.getMessage().indexOf("\"2\"") != -1);
+ }
+ }
+
public void testSAXEntitySizeLimitDP() throws Exception {
System.setProperty(MAX_PARAMETER_ENTITY_SIZE_LIMIT_PROPERTY_NAME, "20000");
XMLReader reader = newDefaultXMLReader();
@@ -321,6 +357,18 @@ public class JAXPSecureProcessingTest ex
}
}
+ public void testSAXEntitySizeLimitDP11() throws Exception {
+ System.setProperty(MAX_PARAMETER_ENTITY_SIZE_LIMIT_PROPERTY_NAME, "20000");
+ XMLReader reader = newDefaultXMLReader();
+ try {
+ reader.parse(new InputData("pEntitySP11.xml"));
+ fail("Expected SAXParseException");
+ }
+ catch (SAXParseException se) {
+ assertTrue(se.getMessage().indexOf("\"20,000\"") != -1);
+ }
+ }
+
public void testDOMEntitySizeLimitSG() throws Exception {
System.setProperty(MAX_GENERAL_ENTITY_SIZE_LIMIT_PROPERTY_NAME, "3");
DocumentBuilder reader = newSecureDocumentBuilder();
@@ -333,6 +381,18 @@ public class JAXPSecureProcessingTest ex
}
}
+ public void testDOMEntitySizeLimitSG11() throws Exception {
+ System.setProperty(MAX_GENERAL_ENTITY_SIZE_LIMIT_PROPERTY_NAME, "3");
+ DocumentBuilder reader = newSecureDocumentBuilder();
+ try {
+ reader.parse(new InputData("gEntitySP11.xml"));
+ fail("Expected SAXParseException");
+ }
+ catch (SAXParseException se) {
+ assertTrue(se.getMessage().indexOf("\"3\"") != -1);
+ }
+ }
+
public void testDOMEntitySizeLimitSP() throws Exception {
System.setProperty(MAX_PARAMETER_ENTITY_SIZE_LIMIT_PROPERTY_NAME, "30000");
DocumentBuilder reader = newSecureDocumentBuilder();
@@ -345,6 +405,18 @@ public class JAXPSecureProcessingTest ex
}
}
+ public void testDOMEntitySizeLimitSP11() throws Exception {
+ System.setProperty(MAX_PARAMETER_ENTITY_SIZE_LIMIT_PROPERTY_NAME, "30000");
+ DocumentBuilder reader = newSecureDocumentBuilder();
+ try {
+ reader.parse(new InputData("pEntitySP11.xml"));
+ fail("Expected SAXParseException");
+ }
+ catch (SAXParseException se) {
+ assertTrue(se.getMessage().indexOf("\"30,000\"") != -1);
+ }
+ }
+
public void testDOMEntitySizeLimitDG() throws Exception {
System.setProperty(MAX_GENERAL_ENTITY_SIZE_LIMIT_PROPERTY_NAME, "4");
DocumentBuilder reader = newDefaultDocumentBuilder();
@@ -357,6 +429,18 @@ public class JAXPSecureProcessingTest ex
}
}
+ public void testDOMEntitySizeLimitDG11() throws Exception {
+ System.setProperty(MAX_GENERAL_ENTITY_SIZE_LIMIT_PROPERTY_NAME, "4");
+ DocumentBuilder reader = newDefaultDocumentBuilder();
+ try {
+ reader.parse(new InputData("gEntitySP11.xml"));
+ fail("Expected SAXParseException");
+ }
+ catch (SAXParseException se) {
+ assertTrue(se.getMessage().indexOf("\"4\"") != -1);
+ }
+ }
+
public void testDOMEntitySizeLimitDP() throws Exception {
System.setProperty(MAX_PARAMETER_ENTITY_SIZE_LIMIT_PROPERTY_NAME, "40000");
DocumentBuilder reader = newDefaultDocumentBuilder();
@@ -365,6 +449,18 @@ public class JAXPSecureProcessingTest ex
fail("Expected SAXParseException");
}
catch (SAXParseException se) {
+ assertTrue(se.getMessage().indexOf("\"40,000\"") != -1);
+ }
+ }
+
+ public void testDOMEntitySizeLimitDP11() throws Exception {
+ System.setProperty(MAX_PARAMETER_ENTITY_SIZE_LIMIT_PROPERTY_NAME, "40000");
+ DocumentBuilder reader = newDefaultDocumentBuilder();
+ try {
+ reader.parse(new InputData("pEntitySP11.xml"));
+ fail("Expected SAXParseException");
+ }
+ catch (SAXParseException se) {
assertTrue(se.getMessage().indexOf("\"40,000\"") != -1);
}
}
Added: xerces/java/trunk/tests/jaxp/data/gEntitySP11.xml
URL: http://svn.apache.org/viewvc/xerces/java/trunk/tests/jaxp/data/gEntitySP11.xml?rev=1718477&view=auto
==============================================================================
--- xerces/java/trunk/tests/jaxp/data/gEntitySP11.xml (added)
+++ xerces/java/trunk/tests/jaxp/data/gEntitySP11.xml Mon Dec 7 21:49:17 2015
@@ -0,0 +1,35 @@
+<?xml version="1.1" encoding="UTF-8"?>
+<!DOCTYPE root [
+ <!ENTITY x0 "x">
+ <!ENTITY x1 "&x0;&x0;">
+ <!ENTITY x2 "&x1;&x1;">
+ <!ENTITY x3 "&x2;&x2;">
+ <!ENTITY x4 "&x3;&x3;">
+ <!ENTITY x5 "&x4;&x4;">
+ <!ENTITY x6 "&x5;&x5;">
+ <!ENTITY x7 "&x6;&x6;">
+ <!ENTITY x8 "&x7;&x7;">
+ <!ENTITY x9 "&x8;&x8;">
+ <!ENTITY x10 "&x9;&x9;">
+ <!ENTITY x11 "&x10;&x10;">
+ <!ENTITY x12 "&x11;&x11;">
+ <!ENTITY x13 "&x12;&x12;">
+ <!ENTITY x14 "&x13;&x13;">
+ <!ENTITY x15 "&x14;&x14;">
+ <!ENTITY x16 "&x15;&x15;">
+ <!ENTITY x17 "&x16;&x16;">
+ <!ENTITY x18 "&x17;&x17;">
+ <!ENTITY x19 "&x18;&x18;">
+ <!ENTITY x20 "&x19;&x19;">
+ <!ENTITY x21 "&x20;&x20;">
+ <!ENTITY x22 "&x21;&x21;">
+ <!ENTITY x23 "&x22;&x22;">
+ <!ENTITY x24 "&x23;&x23;">
+ <!ENTITY x25 "&x24;&x24;">
+ <!ENTITY x26 "&x25;&x25;">
+ <!ENTITY x27 "&x26;&x26;">
+ <!ENTITY x28 "&x27;&x27;">
+ <!ENTITY x29 "&x28;&x28;">
+ <!ENTITY x30 "&x29;&x29;">
+]>
+<root>&x30;</root>
\ No newline at end of file
Propchange: xerces/java/trunk/tests/jaxp/data/gEntitySP11.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/trunk/tests/jaxp/data/gEntitySP11.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/trunk/tests/jaxp/data/pEntitySP11.xml
URL: http://svn.apache.org/viewvc/xerces/java/trunk/tests/jaxp/data/pEntitySP11.xml?rev=1718477&view=auto
==============================================================================
--- xerces/java/trunk/tests/jaxp/data/pEntitySP11.xml (added)
+++ xerces/java/trunk/tests/jaxp/data/pEntitySP11.xml Mon Dec 7 21:49:17 2015
@@ -0,0 +1,3 @@
+<?xml version="1.1" encoding="UTF-8"?>
+<!DOCTYPE root SYSTEM "pEntitySP.dtd">
+<root/>
\ No newline at end of file
Propchange: xerces/java/trunk/tests/jaxp/data/pEntitySP11.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/trunk/tests/jaxp/data/pEntitySP11.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org