Skip to content
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

Jump to bottom

Enable FEATURE_SECURE_PROCESSING XML setting by default #2384

Merged
merged 6 commits into from Feb 8, 2022
Merged

Enable FEATURE_SECURE_PROCESSING XML setting by default #2384

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b90ca28
Enable FEATURE_SECURE_PROCESSING
nvoxland Jan 19, 2022
569d480
Allow disabling of FEATURE_SECURE_PROCESSING by configuration
nvoxland Jan 24, 2022
eecd87b
Merge branch 'master' into enable_xml_secure_processing
nvoxland Jan 24, 2022
8d90124
Added liquibase.secureParsing test
nvoxland Feb 4, 2022
33d9d92
Added liquibase.secureParsing test
nvoxland Feb 4, 2022
4de44c0
Merge branch 'master' into enable_xml_secure_processing
nvoxland Feb 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions liquibase-core/src/main/java/liquibase/GlobalConfiguration.java
View file
Open in desktop
Expand Up @@ -33,6 +33,7 @@ public class GlobalConfiguration implements AutoloadedConfigurations {
public static final ConfigurationDefinition<Boolean> HEADLESS;
public static final ConfigurationDefinition<Boolean> STRICT;
public static final ConfigurationDefinition<Integer> DDL_LOCK_TIMEOUT;
public static final ConfigurationDefinition<Boolean> SECURE_PARSING;

static {
ConfigurationDefinition.Builder builder = new ConfigurationDefinition.Builder("liquibase");
Expand Down Expand Up @@ -175,5 +176,10 @@ public class GlobalConfiguration implements AutoloadedConfigurations {
.addAliasKey("liquibase.ddl_lock_timeout")
.setDescription("The DDL_LOCK_TIMEOUT parameter indicates the number of seconds a DDL command should wait for the locks to become available before throwing the resource busy error message. This applies only to Oracle databases.")
.build();

SECURE_PARSING = builder.define("secureParsing", Boolean.class)
.setDescription("If true, remove functionality from file parsers which could be used insecurely. Examples include (but not limited to) disabling remote XML entity support.")
.setDefaultValue(true)
.build();
}
}
16 changes: 16 additions & 0 deletions liquibase-core/src/main/java/liquibase/parser/core/xml/XMLChangeLogSAXParser.java
View file
Open in desktop
@@ -1,5 +1,6 @@
package liquibase.parser.core.xml;

import liquibase.GlobalConfiguration;
import liquibase.Scope;
import liquibase.changelog.ChangeLogParameters;
import liquibase.exception.ChangeLogParseException;
Expand All @@ -9,6 +10,7 @@
import liquibase.util.FileUtil;
import org.xml.sax.*;

import javax.xml.XMLConstants;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import java.io.IOException;
Expand All @@ -25,6 +27,13 @@ public XMLChangeLogSAXParser() {
saxParserFactory = SAXParserFactory.newInstance();
saxParserFactory.setValidating(true);
saxParserFactory.setNamespaceAware(true);
if (GlobalConfiguration.SECURE_PARSING.getCurrentValue()) {
try {
saxParserFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
} catch (Throwable e) {
Scope.getCurrentScope().getLog(getClass()).fine("Cannot enable FEATURE_SECURE_PROCESSING: " + e.getMessage(), e);
}
}
}

@Override
Expand All @@ -49,6 +58,13 @@ protected SAXParserFactory getSaxParserFactory() {
protected ParsedNode parseToNode(String physicalChangeLogLocation, ChangeLogParameters changeLogParameters, ResourceAccessor resourceAccessor) throws ChangeLogParseException {
try (InputStream inputStream = resourceAccessor.openStream(null, physicalChangeLogLocation)) {
SAXParser parser = saxParserFactory.newSAXParser();
if (GlobalConfiguration.SECURE_PARSING.getCurrentValue()) {
try {
parser.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "http,https"); //need to allow external schemas on http/https to support the liquibase.org xsd files
} catch (SAXException e) {
Scope.getCurrentScope().getLog(getClass()).fine("Cannot enable ACCESS_EXTERNAL_SCHEMA: " + e.getMessage(), e);
}
}
trySetSchemaLanguageProperty(parser);

XMLReader xmlReader = parser.getXMLReader();
Expand Down