diff --git a/src/main/java/com/alibaba/druid/filter/wall/spi/MySqlWallVisitor.java b/src/main/java/com/alibaba/druid/filter/wall/spi/MySqlWallVisitor.java index aab130a4d4..8f07849349 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/spi/MySqlWallVisitor.java +++ b/src/main/java/com/alibaba/druid/filter/wall/spi/MySqlWallVisitor.java @@ -46,18 +46,18 @@ public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisi public MySqlWallVisitor(){ this(new ArrayList(), true); } - - public MySqlWallVisitor(boolean loadDefault) { + + public MySqlWallVisitor(boolean loadDefault){ this(new ArrayList(), loadDefault); } public MySqlWallVisitor(List violations, boolean loadDefault){ this.violations = violations; - loadDefault(); - } - - public void loadDefault() { + if (loadDefault) { + loadDefault(); + } + WallVisitorUtils.loadResource(this.permitNames, "META-INF/druid-filter-wall-permit-name-mysql.txt"); WallVisitorUtils.loadResource(this.permitSchemas, "META-INF/druid-filter-wall-permit-schema-mysql.txt"); WallVisitorUtils.loadResource(this.permitFunctions, "META-INF/druid-filter-wall-permit-function-mysql.txt"); @@ -65,6 +65,14 @@ public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisi WallVisitorUtils.loadResource(this.permitObjects, "META-INF/druid-filter-wall-permit-object-mysql.txt"); } + public void loadDefault() { + WallVisitorUtils.loadResource(this.permitNames, "META-INF/druid-filter-wall-permit-name-mysql-default.txt"); + WallVisitorUtils.loadResource(this.permitSchemas, "META-INF/druid-filter-wall-permit-schema-mysql-default.txt"); + WallVisitorUtils.loadResource(this.permitFunctions, "META-INF/druid-filter-wall-permit-function-mysql-default.txt"); + WallVisitorUtils.loadResource(this.permitTables, "META-INF/druid-filter-wall-permit-table-mysql-default.txt"); + WallVisitorUtils.loadResource(this.permitObjects, "META-INF/druid-filter-wall-permit-object-mysql-default.txt"); + } + public Set getPermitNames() { return permitNames; } diff --git a/src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallVisitor.java b/src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallVisitor.java index 1dbcb8c3df..586f88eeb5 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallVisitor.java +++ b/src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallVisitor.java @@ -46,18 +46,18 @@ public class OracleWallVisitor extends OracleASTVIsitorAdapter implements WallVi public OracleWallVisitor(){ this(new ArrayList(), true); } - - public OracleWallVisitor(boolean loadDefault) { + + public OracleWallVisitor(boolean loadDefault){ this(new ArrayList(), loadDefault); } public OracleWallVisitor(List violations, boolean loadDefault){ this.violations = violations; - loadDefault(); - } - - public void loadDefault() { + if (loadDefault) { + loadDefault(); + } + WallVisitorUtils.loadResource(this.permitNames, "META-INF/druid-filter-wall-permit-name-oracle.txt"); WallVisitorUtils.loadResource(this.permitSchemas, "META-INF/druid-filter-wall-permit-schema-oracle.txt"); WallVisitorUtils.loadResource(this.permitFunctions, "META-INF/druid-filter-wall-permit-function-oracle.txt"); @@ -65,6 +65,14 @@ public class OracleWallVisitor extends OracleASTVIsitorAdapter implements WallVi WallVisitorUtils.loadResource(this.permitObjects, "META-INF/druid-filter-wall-permit-object-oracle.txt"); } + public void loadDefault() { + WallVisitorUtils.loadResource(this.permitNames, "META-INF/druid-filter-wall-permit-name-oracle-default.txt"); + WallVisitorUtils.loadResource(this.permitSchemas, "META-INF/druid-filter-wall-permit-schema-oracle-default.txt"); + WallVisitorUtils.loadResource(this.permitFunctions, "META-INF/druid-filter-wall-permit-function-oracle-default.txt"); + WallVisitorUtils.loadResource(this.permitTables, "META-INF/druid-filter-wall-permit-table-oracle-default.txt"); + WallVisitorUtils.loadResource(this.permitObjects, "META-INF/druid-filter-wall-permit-object-oracle-default.txt"); + } + public void addPermitName(String name) { name = name.toLowerCase(); permitNames.add(name); diff --git a/src/main/resources/META-INF/druid-filter-wall-permit-function-mysql.txt b/src/main/resources/META-INF/druid-filter-wall-permit-function-mysql-default.txt similarity index 100% rename from src/main/resources/META-INF/druid-filter-wall-permit-function-mysql.txt rename to src/main/resources/META-INF/druid-filter-wall-permit-function-mysql-default.txt diff --git a/src/main/resources/META-INF/druid-filter-wall-permit-function-oracle.txt b/src/main/resources/META-INF/druid-filter-wall-permit-function-oracle-default.txt similarity index 100% rename from src/main/resources/META-INF/druid-filter-wall-permit-function-oracle.txt rename to src/main/resources/META-INF/druid-filter-wall-permit-function-oracle-default.txt diff --git a/src/main/resources/META-INF/druid-filter-wall-permit-name-oracle.txt b/src/main/resources/META-INF/druid-filter-wall-permit-name-oracle-default.txt similarity index 100% rename from src/main/resources/META-INF/druid-filter-wall-permit-name-oracle.txt rename to src/main/resources/META-INF/druid-filter-wall-permit-name-oracle-default.txt diff --git a/src/main/resources/META-INF/druid-filter-wall-permit-object-oracle.txt b/src/main/resources/META-INF/druid-filter-wall-permit-object-oracle-default.txt similarity index 100% rename from src/main/resources/META-INF/druid-filter-wall-permit-object-oracle.txt rename to src/main/resources/META-INF/druid-filter-wall-permit-object-oracle-default.txt diff --git a/src/main/resources/META-INF/druid-filter-wall-permit-schema-mysql.txt b/src/main/resources/META-INF/druid-filter-wall-permit-schema-mysql-default.txt similarity index 100% rename from src/main/resources/META-INF/druid-filter-wall-permit-schema-mysql.txt rename to src/main/resources/META-INF/druid-filter-wall-permit-schema-mysql-default.txt diff --git a/src/main/resources/META-INF/druid-filter-wall-permit-schema-oracle.txt b/src/main/resources/META-INF/druid-filter-wall-permit-schema-oracle-default.txt similarity index 100% rename from src/main/resources/META-INF/druid-filter-wall-permit-schema-oracle.txt rename to src/main/resources/META-INF/druid-filter-wall-permit-schema-oracle-default.txt diff --git a/src/main/resources/META-INF/druid-filter-wall-permit-table-oracle.txt b/src/main/resources/META-INF/druid-filter-wall-permit-table-oracle-default.txt similarity index 100% rename from src/main/resources/META-INF/druid-filter-wall-permit-table-oracle.txt rename to src/main/resources/META-INF/druid-filter-wall-permit-table-oracle-default.txt