From d09d2fc75fa906612e75f52173aca41e31fb421b Mon Sep 17 00:00:00 2001
From: wenshao <wenshao@wenshao-workstation.(none)>
Date: Tue, 18 Dec 2012 21:41:47 +0800
Subject: [PATCH] improve WallFilter

---
 .../WallAllowSelectAllColumnDefaultTest.java  | 49 ++++++++++++++++++
 .../wall/WallAllowSelectAllColumnTest.java    | 50 +++++++++++++++++++
 .../wall/WallAllowSelectAllColumnTest1.java   | 50 +++++++++++++++++++
 .../wall/WallAllowSelectAllColumnTest2.java   | 50 +++++++++++++++++++
 4 files changed, 199 insertions(+)
 create mode 100644 src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnDefaultTest.java
 create mode 100644 src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest.java
 create mode 100644 src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest1.java
 create mode 100644 src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest2.java

diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnDefaultTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnDefaultTest.java
new file mode 100644
index 0000000000..30c272515c
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnDefaultTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.bvt.filter.wall;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.wall.WallConfig;
+import com.alibaba.druid.wall.WallUtils;
+
+/**
+ * 这个场景，检测可疑的Having条件
+ * @author wenshao
+ *
+ */
+public class WallAllowSelectAllColumnDefaultTest extends TestCase {
+    private String sql = "select * from t where fid = ?";
+    
+    private WallConfig config = new WallConfig();
+    
+    protected void setUp() throws Exception {
+    }
+
+    public void testMySql() throws Exception {
+        Assert.assertTrue(WallUtils.isValidateMySql(sql, config));
+    }
+    
+    public void testORACLE() throws Exception {
+        Assert.assertTrue(WallUtils.isValidateMySql(sql, config));
+    }
+    
+    public void testSQLServer() throws Exception {
+        Assert.assertTrue(WallUtils.isValidateSqlServer(sql, config));
+    }
+}
diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest.java
new file mode 100644
index 0000000000..7cb0758539
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.bvt.filter.wall;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.wall.WallConfig;
+import com.alibaba.druid.wall.WallUtils;
+
+/**
+ * 这个场景，检测可疑的Having条件
+ * @author wenshao
+ *
+ */
+public class WallAllowSelectAllColumnTest extends TestCase {
+    private String sql = "select * from t where fid = ?";
+    
+    private WallConfig config = new WallConfig();
+    
+    protected void setUp() throws Exception {
+        config.setSelectAllColumnAllow(false);
+    }
+
+    public void testMySql() throws Exception {
+        Assert.assertFalse(WallUtils.isValidateMySql(sql, config));
+    }
+    
+    public void testORACLE() throws Exception {
+        Assert.assertFalse(WallUtils.isValidateMySql(sql, config));
+    }
+    
+    public void testSQLServer() throws Exception {
+        Assert.assertFalse(WallUtils.isValidateSqlServer(sql, config));
+    }
+}
diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest1.java
new file mode 100644
index 0000000000..08885463b7
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest1.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.bvt.filter.wall;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.wall.WallConfig;
+import com.alibaba.druid.wall.WallUtils;
+
+/**
+ * 这个场景，检测可疑的Having条件
+ * @author wenshao
+ *
+ */
+public class WallAllowSelectAllColumnTest1 extends TestCase {
+    private String sql = "select count(*) from t where fid = ?";
+    
+    private WallConfig config = new WallConfig();
+    
+    protected void setUp() throws Exception {
+        config.setSelectAllColumnAllow(false);
+    }
+
+    public void testMySql() throws Exception {
+        Assert.assertTrue(WallUtils.isValidateMySql(sql, config));
+    }
+    
+    public void testORACLE() throws Exception {
+        Assert.assertTrue(WallUtils.isValidateMySql(sql, config));
+    }
+    
+    public void testSQLServer() throws Exception {
+        Assert.assertTrue(WallUtils.isValidateSqlServer(sql, config));
+    }
+}
diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest2.java
new file mode 100644
index 0000000000..674ef0c1a4
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest2.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.bvt.filter.wall;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.wall.WallConfig;
+import com.alibaba.druid.wall.WallUtils;
+
+/**
+ * 这个场景，检测可疑的Having条件
+ * @author wenshao
+ *
+ */
+public class WallAllowSelectAllColumnTest2 extends TestCase {
+    private String sql = "select * from (select id, name from t where fid = ?) as a";
+    
+    private WallConfig config = new WallConfig();
+    
+    protected void setUp() throws Exception {
+        config.setSelectAllColumnAllow(false);
+    }
+
+    public void testMySql() throws Exception {
+        Assert.assertTrue(WallUtils.isValidateMySql(sql, config));
+    }
+    
+    public void testORACLE() throws Exception {
+        Assert.assertTrue(WallUtils.isValidateMySql(sql, config));
+    }
+    
+    public void testSQLServer() throws Exception {
+        Assert.assertTrue(WallUtils.isValidateSqlServer(sql, config));
+    }
+}