-
Notifications
You must be signed in to change notification settings - Fork 9.1k
HADOOP-18469: centralise XML parser creation in XMLUtils #4940
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
b05445f
HADOOP-18469: centralise XML parser creation in XMLUtils
pjfanning b45ba50
build failure
pjfanning e205071
more tests
pjfanning edb2dec
Update JobConfigurationParser.java
pjfanning 93a7556
remove broken tests
pjfanning e44488d
test classes should extend AbstractHadoopTestBase
pjfanning File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
134 changes: 134 additions & 0 deletions
134
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestXMLUtils.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| /** | ||
| * 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.hadoop.util; | ||
|
|
||
| import java.io.InputStream; | ||
| import java.io.StringReader; | ||
| import java.io.StringWriter; | ||
| import javax.xml.parsers.DocumentBuilder; | ||
| import javax.xml.parsers.SAXParser; | ||
| import javax.xml.transform.Transformer; | ||
| import javax.xml.transform.TransformerException; | ||
| import javax.xml.transform.dom.DOMSource; | ||
| import javax.xml.transform.stream.StreamResult; | ||
| import javax.xml.transform.stream.StreamSource; | ||
|
|
||
| import org.apache.hadoop.test.AbstractHadoopTestBase; | ||
|
|
||
| import org.assertj.core.api.Assertions; | ||
| import org.junit.Test; | ||
| import org.w3c.dom.Document; | ||
| import org.xml.sax.InputSource; | ||
| import org.xml.sax.SAXException; | ||
| import org.xml.sax.helpers.DefaultHandler; | ||
|
|
||
| public class TestXMLUtils extends AbstractHadoopTestBase { | ||
|
|
||
| @Test | ||
| public void testSecureDocumentBuilderFactory() throws Exception { | ||
| DocumentBuilder db = XMLUtils.newSecureDocumentBuilderFactory().newDocumentBuilder(); | ||
| Document doc = db.parse(new InputSource(new StringReader("<root/>"))); | ||
| Assertions.assertThat(doc).describedAs("parsed document").isNotNull(); | ||
| } | ||
|
|
||
| @Test(expected = SAXException.class) | ||
| public void testExternalDtdWithSecureDocumentBuilderFactory() throws Exception { | ||
| DocumentBuilder db = XMLUtils.newSecureDocumentBuilderFactory().newDocumentBuilder(); | ||
| try (InputStream stream = getResourceStream("/xml/external-dtd.xml")) { | ||
| Document doc = db.parse(stream); | ||
| } | ||
| } | ||
|
|
||
| @Test(expected = SAXException.class) | ||
| public void testEntityDtdWithSecureDocumentBuilderFactory() throws Exception { | ||
| DocumentBuilder db = XMLUtils.newSecureDocumentBuilderFactory().newDocumentBuilder(); | ||
| try (InputStream stream = getResourceStream("/xml/entity-dtd.xml")) { | ||
| Document doc = db.parse(stream); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testSecureSAXParserFactory() throws Exception { | ||
| SAXParser parser = XMLUtils.newSecureSAXParserFactory().newSAXParser(); | ||
| parser.parse(new InputSource(new StringReader("<root/>")), new DefaultHandler()); | ||
| } | ||
|
|
||
| @Test(expected = SAXException.class) | ||
| public void testExternalDtdWithSecureSAXParserFactory() throws Exception { | ||
| SAXParser parser = XMLUtils.newSecureSAXParserFactory().newSAXParser(); | ||
| try (InputStream stream = getResourceStream("/xml/external-dtd.xml")) { | ||
| parser.parse(stream, new DefaultHandler()); | ||
| } | ||
| } | ||
|
|
||
| @Test(expected = SAXException.class) | ||
| public void testEntityDtdWithSecureSAXParserFactory() throws Exception { | ||
| SAXParser parser = XMLUtils.newSecureSAXParserFactory().newSAXParser(); | ||
| try (InputStream stream = getResourceStream("/xml/entity-dtd.xml")) { | ||
| parser.parse(stream, new DefaultHandler()); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testSecureTransformerFactory() throws Exception { | ||
| Transformer transformer = XMLUtils.newSecureTransformerFactory().newTransformer(); | ||
| DocumentBuilder db = XMLUtils.newSecureDocumentBuilderFactory().newDocumentBuilder(); | ||
| Document doc = db.parse(new InputSource(new StringReader("<root/>"))); | ||
| try (StringWriter stringWriter = new StringWriter()) { | ||
| transformer.transform(new DOMSource(doc), new StreamResult(stringWriter)); | ||
| Assertions.assertThat(stringWriter.toString()).contains("<root"); | ||
| } | ||
| } | ||
|
|
||
| @Test(expected = TransformerException.class) | ||
| public void testExternalDtdWithSecureTransformerFactory() throws Exception { | ||
| Transformer transformer = XMLUtils.newSecureTransformerFactory().newTransformer(); | ||
| try ( | ||
| InputStream stream = getResourceStream("/xml/external-dtd.xml"); | ||
| StringWriter stringWriter = new StringWriter() | ||
| ) { | ||
| transformer.transform(new StreamSource(stream), new StreamResult(stringWriter)); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testSecureSAXTransformerFactory() throws Exception { | ||
| Transformer transformer = XMLUtils.newSecureSAXTransformerFactory().newTransformer(); | ||
| DocumentBuilder db = XMLUtils.newSecureDocumentBuilderFactory().newDocumentBuilder(); | ||
| Document doc = db.parse(new InputSource(new StringReader("<root/>"))); | ||
| try (StringWriter stringWriter = new StringWriter()) { | ||
| transformer.transform(new DOMSource(doc), new StreamResult(stringWriter)); | ||
| Assertions.assertThat(stringWriter.toString()).contains("<root"); | ||
| } | ||
| } | ||
|
|
||
| @Test(expected = TransformerException.class) | ||
| public void testExternalDtdWithSecureSAXTransformerFactory() throws Exception { | ||
| Transformer transformer = XMLUtils.newSecureSAXTransformerFactory().newTransformer(); | ||
| try ( | ||
| InputStream stream = getResourceStream("/xml/external-dtd.xml"); | ||
| StringWriter stringWriter = new StringWriter() | ||
| ) { | ||
| transformer.transform(new StreamSource(stream), new StreamResult(stringWriter)); | ||
| } | ||
| } | ||
|
|
||
| private static InputStream getResourceStream(final String filename) { | ||
| return TestXMLUtils.class.getResourceAsStream(filename); | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
hadoop-common-project/hadoop-common/src/test/resources/xml/entity-dtd.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| 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. | ||
| --> | ||
| <!DOCTYPE lolz [ | ||
| <!ENTITY lol "lol"> | ||
| <!ELEMENT lolz (#PCDATA)> | ||
| ]> | ||
| <lolz>&lol;</lolz> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.