Skip to content

HV-2105 Fix XXE Vulnerability in Schema Loading #1617

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

Closed
wants to merge 1 commit into from
Closed

HV-2105 Fix XXE Vulnerability in Schema Loading #1617

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
42 changes: 22 additions & 20 deletions engine/src/main/java/org/hibernate/validator/internal/xml/XmlParserHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,26 +138,28 @@ public Schema getSchema(String schemaResource) {
}

private Schema loadSchema(String schemaResource) {
ClassLoader loader = GetClassLoader.fromClass( XmlParserHelper.class );

URL schemaUrl = GetResource.action( loader, schemaResource );
SchemaFactory sf = SchemaFactory.newInstance( javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI );

try {
sf.setFeature( javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true );
}
catch (SAXException e) {
LOG.unableToEnableSecureFeatureProcessingSchemaXml( schemaResource, e.getMessage() );
}

Schema schema = null;
try {
schema = NewSchema.action( sf, schemaUrl );
}
catch (Exception e) {
LOG.unableToCreateSchema( schemaResource, e.getMessage() );
}
return schema;
ClassLoader loader = GetClassLoader.fromClass(XmlParserHelper.class);

URL schemaUrl = GetResource.action(loader, schemaResource);
SchemaFactory sf = SchemaFactory.newInstance(javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI);

// Security improvement: Restrict access to external DTDs and schemas
try {
sf.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
sf.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
} catch (SAXException e) {
// Some older parsers might not support these properties
LOG.debug("Unable to set external access restrictions on schema factory", e);
}

Schema schema = null;
try {
schema = NewSchema.action(sf, schemaUrl);
}
catch (Exception e) {
LOG.unableToCreateSchema(schemaResource, e.getMessage());
}
return schema;
}

}
Loading