Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

bug fix for sql wall

Browse Source
This commit is contained in:
高铁
2019-08-27 18:22:13 +08:00
parent d2b12bc586
commit df7ef2fd66
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java
+14
View File
@@ -288,6 +288,20 @@ public class WallVisitorUtils {
return;
}
List<SQLCommentHint> hints = x.getHintsDirect();
if (hints != null
&& x.getParent() instanceof SQLUnionQuery
&& x == ((SQLUnionQuery) x.getParent()).getRight()
) {
for (SQLCommentHint hint : hints) {
String text = hint.getText();
if (text.startsWith("!")) {
addViolation(visitor, ErrorCode.UNION, "union select hint not allow", x);
return;
}
}
}
SQLExpr where = x.getWhere();
if (where != null) {
checkCondition(visitor, x.getWhere());
src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_union.java
+17
View File
@@ -44,4 +44,21 @@ public class MySqlWallTest_union extends TestCase {
Assert.assertTrue(WallUtils.isValidateMySql("select f1, f2 from t where id=1 union select 'u1' as u1, 'u2' as u2", config)); // union select item has alias
}
public void testUnion2() throws Exception
{
assertFalse(
WallUtils.isValidateMySql("SELECT name, surname FROM users WHERE name='' UNION SELECT @@version, 'string1'")
);
assertFalse(
WallUtils.isValidateMySql("SELECT name, surname FROM users WHERE name='' UNION SELECT /*! @@version,*/ 'string1'")
);
assertFalse(
WallUtils.isValidateMySql("SELECT name, surname FROM users WHERE name=' ' UNION SELECT /*! (select table_name FROM information_schema.tables limit 1,1),*/ 'string1'")
);
}
}