From a31afb10c402a996e2eee28ef4408d66932dd962 Mon Sep 17 00:00:00 2001 From: wenshao Date: Wed, 12 Jul 2017 00:40:38 +0800 Subject: [PATCH] bug fixed for issue #1759 #1807 --- .../druid/wall/spi/WallVisitorUtils.java | 4 +++- .../com/alibaba/druid/bvt/bug/Issue1759.java | 24 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/bug/Issue1759.java diff --git a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java index 548601fd4b..81a6a64276 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java @@ -2396,7 +2396,9 @@ public class WallVisitorUtils { boolean allow = false; int errorCode; String denyMessage; - if (x instanceof SQLInsertStatement) { + if (x instanceof SQLCommentStatement) { + return; + } else if (x instanceof SQLInsertStatement) { allow = config.isInsertAllow(); denyMessage = "insert not allow"; errorCode = ErrorCode.INSERT_NOT_ALLOW; diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Issue1759.java b/src/test/java/com/alibaba/druid/bvt/bug/Issue1759.java new file mode 100644 index 0000000000..50c3f53f03 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/bug/Issue1759.java @@ -0,0 +1,24 @@ +package com.alibaba.druid.bvt.bug; + +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.wall.WallCheckResult; +import com.alibaba.druid.wall.spi.OracleWallProvider; +import junit.framework.TestCase; + +/** + * Created by wenshao on 12/07/2017. + */ +public class Issue1759 extends TestCase { + public void test_0() throws Exception { + String sql = "COMMENT ON COLUMN \"TB_CRM_MATERIAL\".\"INVALID_TIME\" IS '生效时间'"; + + OracleStatementParser parser = new OracleStatementParser(sql); + SQLStatement statement = parser.parseStatement();// 分号之后多语句忽略 + OracleWallProvider provider = new OracleWallProvider(); + + WallCheckResult result1 = provider.check(sql); + + assertTrue(result1.getViolations().size() == 0); + } +}