diff --git a/src/main/resources/META-INF/druid/wall/mysql/deny-variant.txt b/src/main/resources/META-INF/druid/wall/mysql/deny-variant.txt index 9c0c1da30a..cd5d1b3695 100644 --- a/src/main/resources/META-INF/druid/wall/mysql/deny-variant.txt +++ b/src/main/resources/META-INF/druid/wall/mysql/deny-variant.txt @@ -1,3 +1,3 @@ basedir version_compile_os -version \ No newline at end of file +datadir \ No newline at end of file diff --git a/src/main/resources/META-INF/druid/wall/sqlserver/deny-function.txt b/src/main/resources/META-INF/druid/wall/sqlserver/deny-function.txt index c08c96cec1..8dd4b4ecc1 100644 --- a/src/main/resources/META-INF/druid/wall/sqlserver/deny-function.txt +++ b/src/main/resources/META-INF/druid/wall/sqlserver/deny-function.txt @@ -1,5 +1,12 @@ -sp_executesql -user_name +db_name +col_name +object_id +host_name is_srvrolemember -DB_NAME -HOST_NAME +is_member +opendatasource +openrowset +openquery +has_dbaccess +sp_executesql +user_name \ No newline at end of file diff --git a/src/main/resources/META-INF/druid/wall/sqlserver/deny-schema.txt b/src/main/resources/META-INF/druid/wall/sqlserver/deny-schema.txt index db477f9675..7609c80558 100644 --- a/src/main/resources/META-INF/druid/wall/sqlserver/deny-schema.txt +++ b/src/main/resources/META-INF/druid/wall/sqlserver/deny-schema.txt @@ -1,2 +1,5 @@ master -sys \ No newline at end of file +sys +sysobjects +sysdatabases +information_schema \ No newline at end of file diff --git a/src/main/resources/META-INF/druid/wall/sqlserver/deny-variant.txt b/src/main/resources/META-INF/druid/wall/sqlserver/deny-variant.txt index fda7909c8f..b75d48067d 100644 --- a/src/main/resources/META-INF/druid/wall/sqlserver/deny-variant.txt +++ b/src/main/resources/META-INF/druid/wall/sqlserver/deny-variant.txt @@ -1,2 +1,4 @@ +servername +version user system_user \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallPermitFunctionTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallPermitFunctionTest.java index 39506e3cd8..845045b568 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallPermitFunctionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallPermitFunctionTest.java @@ -54,7 +54,7 @@ public class SQLServerWallPermitFunctionTest extends TestCase { } public void test01() throws Exception { - Assert.assertTrue(WallUtils.isValidateSqlServer("SELECT user_name() FROM X;")); + Assert.assertFalse(WallUtils.isValidateSqlServer("SELECT user_name() FROM X;")); } public final void test_sp_addsrvrolemenber() throws Exception {