improved wall filter. for issue #2371

This commit is contained in:
wenshao
2018-03-10 23:37:52 +08:00
parent b66ca83cae
commit a69b5ddcbc
11 changed files with 238 additions and 5 deletions
@@ -288,4 +288,9 @@ public class DB2WallVisitor extends DB2ASTVisitorAdapter implements WallVisitor
public List<WallUpdateCheckItem> getUpdateCheckItems() {
return updateCheckItems;
}
public boolean visit(SQLJoinTableSource x) {
WallVisitorUtils.check(this, x);
return true;
}
}
@@ -20,9 +20,7 @@ import java.util.List;
import com.alibaba.druid.sql.PagerUtils;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLCommentHint;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.*;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
import com.alibaba.druid.sql.ast.expr.SQLInListExpr;
import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
@@ -35,7 +33,6 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStateme
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlDeleteStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock;
import com.alibaba.druid.sql.ast.SQLLimit;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowCreateTableStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
@@ -450,4 +447,9 @@ public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisi
public List<WallUpdateCheckItem> getUpdateCheckItems() {
return updateCheckItems;
}
public boolean visit(SQLJoinTableSource x) {
WallVisitorUtils.check(this, x);
return true;
}
}
@@ -354,4 +354,9 @@ public class OracleWallVisitor extends OracleASTVisitorAdapter implements WallVi
public List<WallUpdateCheckItem> getUpdateCheckItems() {
return updateCheckItems;
}
public boolean visit(SQLJoinTableSource x) {
WallVisitorUtils.check(this, x);
return true;
}
}
@@ -311,4 +311,9 @@ public class PGWallVisitor extends PGASTVisitorAdapter implements WallVisitor {
public List<WallUpdateCheckItem> getUpdateCheckItems() {
return updateCheckItems;
}
public boolean visit(SQLJoinTableSource x) {
WallVisitorUtils.check(this, x);
return true;
}
}
@@ -347,4 +347,9 @@ public class SQLServerWallVisitor extends SQLServerASTVisitorAdapter implements
public List<WallUpdateCheckItem> getUpdateCheckItems() {
return updateCheckItems;
}
public boolean visit(SQLJoinTableSource x) {
WallVisitorUtils.check(this, x);
return true;
}
}
@@ -2644,4 +2644,11 @@ public class WallVisitorUtils {
addViolation(visitor, ErrorCode.EVIL_HINTS, "hint not allow", x);
}
}
public static void check(WallVisitor visitor, SQLJoinTableSource x) {
SQLExpr condition = x.getCondition();
if (condition instanceof SQLName) {
addViolation(visitor, ErrorCode.INVALID_JOIN_CONDITION, "invalid join condition", x);
}
}
}
@@ -82,6 +82,7 @@ public interface ErrorCode {
public final static int READ_ONLY = 4000;
public final static int UNION = 5000;
public final static int INVALID_JOIN_CONDITION = 6000;
public final static int COMPOUND = 8000;