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

[XSDLookUp] Updated entity resolver to not fallback to network lookup when xsd is not found #2558

Merged
merged 5 commits into from
Mar 1, 2022
Merged

[XSDLookUp] Updated entity resolver to not fallback to network lookup when xsd is not found #2558

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e9dbdd
[XSDLookUp] Updated entity resolver to not fallback to network lookup…
Feb 18, 2022
aa76cfe
Merge branch 'XSDLookUpUpdate' of https://github.com/kavya-shastri/li…
nvoxland Feb 23, 2022
f00d43b
Updated LiquibaseEntityResolver's secureParsing error message
nvoxland Feb 23, 2022
63daeb2
Merge remote-tracking branch 'origin/master' into kavya-shastri-XSDLo…
nvoxland Feb 28, 2022
54e15c7
Updated LiquibaseEntityResolver's secureParsing error message
nvoxland Feb 28, 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
13 changes: 10 additions & 3 deletions liquibase-core/src/main/java/liquibase/parser/core/xml/LiquibaseEntityResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
package liquibase.parser.core.xml;

import liquibase.GlobalConfiguration;
import liquibase.Scope;
import liquibase.logging.Logger;
import liquibase.resource.*;
import liquibase.resource.ClassLoaderResourceAccessor;
import liquibase.resource.InputStreamList;
import liquibase.resource.ResourceAccessor;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.ext.EntityResolver2;
Expand Down Expand Up @@ -34,13 +37,17 @@ public InputSource resolveEntity(String name, String publicId, String baseURI, S
.replace("http://www.liquibase.org/xml/ns/migrator/", "http://www.liquibase.org/xml/ns/dbchangelog/")
.replaceFirst("https?://", "");


ResourceAccessor resourceAccessor = Scope.getCurrentScope().getResourceAccessor();
InputStreamList streams = resourceAccessor.openStreams(null, path);
if (streams.isEmpty()) {
streams = getFallbackResourceAccessor().openStreams(null, path);

if (streams.isEmpty()) {
if (streams.isEmpty() && GlobalConfiguration.SECURE_PARSING.getCurrentValue()) {
String errorMessage = "Unable to resolve xml entity " + systemId + " locally: " +
GlobalConfiguration.SECURE_PARSING.getKey() + " is set to 'true' which does not allow remote lookups. " +
"Set it to 'false' to allow remote lookups of xsd files.";
throw new XSDLookUpException(errorMessage);
} else {
log.fine("Unable to resolve XML entity locally. Will load from network.");
return null;
}
Expand Down
9 changes: 9 additions & 0 deletions liquibase-core/src/main/java/liquibase/parser/core/xml/XSDLookUpException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package liquibase.parser.core.xml;

public class XSDLookUpException extends RuntimeException{

public XSDLookUpException(String message) {
super(message);
}

}