Skip to content

Disallow DOCTYPE in TestReader XML parser #1252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Keerthana-64 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Disallow DOCTYPE in TestReader XML parser #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions modules/app/src/test/java/org/locationtech/jtstest/TestReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package org.locationtech.jtstest;

import java.io.File;
import java.nio.file.Files;
import java.util.Iterator;
import java.util.StringTokenizer;

Expand Down Expand Up @@ -49,6 +50,24 @@ public void testDummy()
{

}

public void testExternalGeometryNotIncluded() throws Exception {
File wkt = File.createTempFile("geometry", ".wkt");
File xml = File.createTempFile("testreader", ".xml");
try {
Files.write(wkt.toPath(), "POINT (10 20)".getBytes("UTF-8"));
String run = "<!DOCTYPE run [ <!ENTITY a SYSTEM \"" + wkt.toURI() + "\"> ]>"
+ "<run><case><a>&a;</a><test><op name=\"isValid\" arg1=\"A\">true</op></test></case></run>";
Files.write(xml.toPath(), run.getBytes("UTF-8"));
TestReader testReader = new TestReader();
assertNull(testReader.createTestRun(xml, 0));
assertEquals(1, testReader.getParsingProblems().size());
}
finally {
wkt.delete();
xml.delete();
}
}

public void XtestWktFile() {
TestReader testReader = new TestReader();
Expand Down
2 changes: 2 additions & 0 deletions modules/tests/src/main/java/org/locationtech/jtstest/testrunner/TestReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ public void clearParsingProblems() {
public TestRun createTestRun(File testFile, int runIndex) {
try {
SAXBuilder builder = new SAXBuilder( );
// test files do not require DOCTYPE
builder.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
builder.setJDOMFactory(new LocatedJDOMFactory());
Document document = builder.build(new FileInputStream(testFile));
Element runElement = document.getRootElement();
Expand Down