Skip to content

Add xml parser configurations #1854

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

Merged
theghost5800 merged 1 commit into from
Jun 8, 2026
Merged

Add xml parser configurations #1854

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
16 changes: 15 additions & 1 deletion .../cloudfoundry/multiapps/controller/web/util/XmlNamespaceIgnoringHttpMessageConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,26 @@
import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.XMLFilter;
import org.xml.sax.XMLReader;

public class XmlNamespaceIgnoringHttpMessageConverter implements HttpMessageConverter<Object> {

private static final SAXParserFactory SAX_PARSER_FACTORY = SAXParserFactory.newInstance();
private static final SAXParserFactory SAX_PARSER_FACTORY = createSaxParserFactory();

private static SAXParserFactory createSaxParserFactory() {
SAXParserFactory factory = SAXParserFactory.newInstance();
try {
factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
} catch (SAXNotRecognizedException | SAXNotSupportedException | ParserConfigurationException e) {
throw new ExceptionInInitializerError(e);
}
return factory;
}

private final Jaxb2RootElementHttpMessageConverter delegate = new Jaxb2RootElementHttpMessageConverter();

Expand Down
19 changes: 19 additions & 0 deletions ...udfoundry/multiapps/controller/web/util/XmlNamespaceIgnoringHttpMessageConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,21 @@
import java.io.InputStream;
import java.util.stream.Stream;

import org.cloudfoundry.multiapps.common.ParsingException;
import org.cloudfoundry.multiapps.common.test.Tester;
import org.cloudfoundry.multiapps.common.test.Tester.Expectation;
import org.cloudfoundry.multiapps.controller.web.util.bar.Bar;
import org.cloudfoundry.multiapps.controller.web.util.foo.Foo;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpInputMessage;

import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

class XmlNamespaceIgnoringHttpMessageConverterTest {

private final Tester tester = Tester.forClass(getClass());
Expand Down Expand Up @@ -43,6 +48,20 @@
tester.test(() -> converter.read(type, createHttpInputMessage(entityResource)), expectation);
}

@Test
void testReadFromRejectsExternalEntityXxeAttack() {
ParsingException e = assertThrows(ParsingException.class,

Check warning on line 53 in multiapps-controller-web/src/test/java/org/cloudfoundry/multiapps/controller/web/util/XmlNamespaceIgnoringHttpMessageConverterTest.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Refactor the code of the lambda to have only one invocation possibly throwing a runtime exception. 


See more on https://sonarcloud.io/project/issues?id=cloudfoundry_multiapps-controller&issues=AZ6nLmgZXEn0v6y3VX1x&open=AZ6nLmgZXEn0v6y3VX1x&pullRequest=1854
() -> converter.read(Foo.class, createHttpInputMessage("xxe-external-entity.xml")));
assertTrue(e.getCause().toString().contains("DOCTYPE is disallowed"), "Expected DOCTYPE rejection but got: " + e.getCause());
}

@Test
void testReadFromRejectsBillionLaughsDoSAttack() {
ParsingException e = assertThrows(ParsingException.class,

Check warning on line 60 in multiapps-controller-web/src/test/java/org/cloudfoundry/multiapps/controller/web/util/XmlNamespaceIgnoringHttpMessageConverterTest.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Refactor the code of the lambda to have only one invocation possibly throwing a runtime exception. 


See more on https://sonarcloud.io/project/issues?id=cloudfoundry_multiapps-controller&issues=AZ6nLmgZXEn0v6y3VX1y&open=AZ6nLmgZXEn0v6y3VX1y&pullRequest=1854
() -> converter.read(Foo.class, createHttpInputMessage("xxe-billion-laughs.xml")));
assertTrue(e.getCause().toString().contains("DOCTYPE is disallowed"), "Expected DOCTYPE rejection but got: " + e.getCause());
}

private HttpInputMessage createHttpInputMessage(String resource) {
return new HttpInputMessage() {

Expand Down
13 changes: 13 additions & 0 deletions .../src/test/resources/org/cloudfoundry/multiapps/controller/web/util/xxe-billion-laughs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0"?>
<!DOCTYPE model [
<!ENTITY lol "lol">
<!ENTITY lol2 "&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;">
<!ENTITY lol3 "&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;">
<!ENTITY lol4 "&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;">
]>
<model>
<property-1>&lol4;</property-1>
<property-2>property-2-value</property-2>
<property-3>1000</property-3>
<property-4>true</property-4>
</model>
10 changes: 10 additions & 0 deletions ...src/test/resources/org/cloudfoundry/multiapps/controller/web/util/xxe-external-entity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0"?>
<!DOCTYPE model [
<!ENTITY xxe SYSTEM "file:///etc/passwd">
]>
<model>
<property-1>&xxe;</property-1>
<property-2>property-2-value</property-2>
<property-3>1000</property-3>
<property-4>true</property-4>
</model>
Loading