Skip to content

Potential fix for code scanning alert no. 146: Resolving XML external entity in user-controlled data #27

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
AndresMaqueo merged 1 commit into from
Dec 31, 2025
Merged

Potential fix for code scanning alert no. 146: Resolving XML external entity in user-controlled data #27

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
27 changes: 27 additions & 0 deletions ...-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,17 @@ public static VersionDefinitionXml load(String xml) throws Exception {
private static VersionDefinitionXml load(InputStream stream) throws Exception {

XMLInputFactory xmlFactory = XMLInputFactory.newInstance();
// Harden the XMLInputFactory against XXE
try {
xmlFactory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE);
} catch (IllegalArgumentException ignored) {
// Property not supported by this implementation; ignore.
}
try {
xmlFactory.setProperty("javax.xml.stream.isSupportingExternalEntities", Boolean.FALSE);
} catch (IllegalArgumentException ignored) {
// Property not supported by this implementation; ignore.
}
XMLStreamReader xmlReader = xmlFactory.createXMLStreamReader(stream);

xmlReader.nextTag();
Expand All @@ -602,6 +613,22 @@ private static VersionDefinitionXml load(InputStream stream) throws Exception {
Unmarshaller unmarshaller = ctx.createUnmarshaller();

SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
// Harden the SchemaFactory against XXE and external resource loading
try {
factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
} catch (Exception ignored) {
// Feature not supported; ignore.
}
try {
factory.setProperty("http://apache.org/xml/properties/accessExternalDTD", "");
} catch (IllegalArgumentException ignored) {
// Property not supported by this implementation; ignore.
}
try {
factory.setProperty("http://apache.org/xml/properties/accessExternalSchema", "");
} catch (IllegalArgumentException ignored) {
// Property not supported by this implementation; ignore.
}
Schema schema = factory.newSchema(new StreamSource(xsdStream));
unmarshaller.setSchema(schema);

Expand Down