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

Merge branch 'master' of https://github.com/wenshao/druid

Browse Source
This commit is contained in:
wenshao
2013-04-13 23:37:41 +08:00
parent 65b505acc7 e2993be3f7
commit fd1273e0e4
16 changed files with 240 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+1 -1
View File
@@ -891,7 +891,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
if (pooledConnection.getOwnerThread() != Thread.currentThread()) {
throw new SQLException("closed error, get/close not same thread");
LOG.warn("get/close not same thread");
}
final Connection physicalConnection = holder.getConnection();
src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java
+15 -3
View File
@@ -1025,15 +1025,27 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
public void checkState() throws SQLException {
if (holder == null) {
throw new SQLException("connection holder is null");
if (disableError != null) {
throw new SQLException("connection holder is null", disableError);
} else {
throw new SQLException("connection holder is null");
}
}
if (closed) {
throw new SQLException("connection closed");
if (disableError != null) {
throw new SQLException("connection closed", disableError);
} else {
throw new SQLException("connection closed");
}
}
if (disable) {
throw new SQLException("connection disabled", disableError);
if (disableError != null) {
throw new SQLException("connection disabled", disableError);
} else {
throw new SQLException("connection disabled");
}
}
}
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java
+7 -1
View File
@@ -67,6 +67,11 @@ public class MySqlLexer extends Lexer {
throw new ParserException("illegal stat");
}
if (charAt(pos + 1) == '{') {
scanVariable();
return;
}
Token lastToken = this.token;
scanChar();
@@ -259,6 +264,7 @@ public class MySqlLexer extends Lexer {
final char ch = text.charAt(i);
if (ch == '\\') {
hasSpecial = true;
continue;
}
if (ch == '\'') {
endIndex = i;
@@ -419,7 +425,7 @@ public class MySqlLexer extends Lexer {
}
if (isHint) {
stringVal = subString(mark + startHintSp, (bufPos - startHintSp) - 1);
stringVal = subString(mark + startHintSp, (bufPos - startHintSp) - 2);
token = Token.HINT;
} else {
stringVal = subString(mark, bufPos);
src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java
+1 -1
View File
@@ -649,7 +649,7 @@ public class SQLEvalVisitorUtils {
}
public static boolean visit(SQLEvalVisitor visitor, SQLQueryExpr x) {
if (WallVisitorUtils.isSimpleCountTableSource(((SQLQueryExpr) x).getSubQuery())) {
if (WallVisitorUtils.isSimpleCountTableSource(null, ((SQLQueryExpr) x).getSubQuery())) {
x.putAttribute(EVAL_VALUE, 1);
return false;
}
src/main/java/com/alibaba/druid/wall/WallContext.java
+12
View File
@@ -31,6 +31,7 @@ public class WallContext {
private int unionWarnnings = 0;
private int updateNoneConditionWarnnings = 0;
private int deleteNoneConditionWarnnings = 0;
private int likeNumberWarnnings = 0;
public WallContext(String dbType){
this.dbType = dbType;
@@ -141,6 +142,17 @@ public class WallContext {
this.warnnings++;
}
public int getLikeNumberWarnnings() {
return likeNumberWarnnings;
}
public void incrementLikeNumberWarnnings() {
if (likeNumberWarnnings == 0) {
this.warnnings++;
}
likeNumberWarnnings++;
}
public int getUnionWarnnings() {
return unionWarnnings;
}
src/main/java/com/alibaba/druid/wall/WallProvider.java
+2
View File
@@ -476,6 +476,8 @@ public abstract class WallProvider {
violations.add(new IllegalSQLObjectViolation(ErrorCode.NONE_CONDITION, "update none condition", sql));
} else if (context.getCommentCount() > 0) {
violations.add(new IllegalSQLObjectViolation(ErrorCode.COMMIT_NOT_ALLOW, "comment not allow", sql));
} else if (context.getLikeNumberWarnnings() > 0) {
violations.add(new IllegalSQLObjectViolation(ErrorCode.COMMIT_NOT_ALLOW, "like number", sql));
} else {
violations.add(new IllegalSQLObjectViolation(ErrorCode.COMPOUND, "multi-warnnings", sql));
}
src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java
+2 -2
View File
@@ -206,7 +206,7 @@ public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisi
}
if (!checkVar(x.getParent(), x.getName())) {
boolean isTop = WallVisitorUtils.isTopNoneFromSelect(x);
boolean isTop = WallVisitorUtils.isTopNoneFromSelect(this, x);
if (!isTop) {
violations.add(new IllegalSQLObjectViolation(ErrorCode.VARIANT_DENY, "variable not allow : "
+ x.getName(), toSQL(x)));
@@ -255,7 +255,7 @@ public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisi
}
if (varName.startsWith("@@") && !checkVar(x.getParent(), x.getName())) {
boolean isTop = WallVisitorUtils.isTopNoneFromSelect(x);
boolean isTop = WallVisitorUtils.isTopNoneFromSelect(this, x);
if (!isTop) {
violations.add(new IllegalSQLObjectViolation(ErrorCode.VARIANT_DENY, "variable not allow : "
+ x.getName(), toSQL(x)));
src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java
+44 -30
View File
@@ -236,9 +236,9 @@ public class WallVisitorUtils {
addViolation(visitor, ErrorCode.INSERT_NOT_ALLOW, "delete not allow", x);
return;
}
boolean hasUsing = false;
if (x instanceof MySqlDeleteStatement) {
hasUsing = ((MySqlDeleteStatement) x).getUsing() != null;
}
@@ -479,7 +479,7 @@ public class WallVisitorUtils {
checkConditionForMultiTenant(visitor, x.getWhere(), x);
}
public static Object getValue(SQLBinaryOpExpr x) {
public static Object getValue(WallVisitor visitor, SQLBinaryOpExpr x) {
if (x.getLeft() instanceof SQLName && x.getRight() instanceof SQLName) {
if (x.getLeft().toString().equalsIgnoreCase(x.getRight().toString())) {
if (x.getOperator() == SQLBinaryOperator.Equality) {
@@ -523,7 +523,7 @@ public class WallVisitorUtils {
boolean allFalse = true;
for (int i = groupList.size() - 1; i >= 0; --i) {
Object result = getValue(groupList.get(i));
Object result = getValue(visitor, groupList.get(i));
if (Boolean.TRUE == result) {
final WallConditionContext wallContext = WallVisitorUtils.getWallConditionContext();
if (wallContext != null) {
@@ -546,8 +546,17 @@ public class WallVisitorUtils {
SQLExpr left = x.getLeft();
SQLExpr right = x.getRight();
Object leftResult = getValue(left);
Object rightResult = getValue(right);
Object leftResult = getValue(visitor, left);
Object rightResult = getValue(visitor, right);
if (x.getOperator() == SQLBinaryOperator.Like || x.getOperator() == SQLBinaryOperator.NotLike) {
WallContext context = WallContext.current();
if (context != null) {
if (rightResult instanceof Number || leftResult instanceof Number) {
context.incrementLikeNumberWarnnings();
}
}
}
if (x.getOperator() == SQLBinaryOperator.BooleanAnd) {
if (Boolean.FALSE == leftResult || Boolean.FALSE == rightResult) {
@@ -659,7 +668,7 @@ public class WallVisitorUtils {
final WallConditionContext old = wallConditionContextLocal.get();
try {
wallConditionContextLocal.set(new WallConditionContext());
final Object value = getValue(x);
final Object value = getValue(visitor, x);
final WallConditionContext current = wallConditionContextLocal.get();
WallContext context = WallContext.current();
@@ -692,8 +701,12 @@ public class WallVisitorUtils {
}
public static Object getValue(SQLExpr x) {
return getValue(null, x);
}
public static Object getValue(WallVisitor visitor, SQLExpr x) {
if (x instanceof SQLBinaryOpExpr) {
return getValue((SQLBinaryOpExpr) x);
return getValue(visitor, (SQLBinaryOpExpr) x);
}
if (x instanceof MySqlBooleanExpr) {
@@ -713,31 +726,31 @@ public class WallVisitorUtils {
}
if (x instanceof SQLNotExpr) {
Object result = getValue(((SQLNotExpr) x).getExpr());
Object result = getValue(visitor, ((SQLNotExpr) x).getExpr());
if (result instanceof Boolean) {
return !((Boolean) result).booleanValue();
}
}
if (x instanceof SQLQueryExpr) {
if (isSimpleCountTableSource(((SQLQueryExpr) x).getSubQuery())) {
if (isSimpleCountTableSource(visitor, ((SQLQueryExpr) x).getSubQuery())) {
return Integer.valueOf(1);
}
}
if (x instanceof SQLMethodInvokeExpr) {
return getValue((SQLMethodInvokeExpr) x);
return getValue(visitor, (SQLMethodInvokeExpr) x);
}
return null;
}
public static Object getValue(SQLMethodInvokeExpr x) {
public static Object getValue(WallVisitor visitor, SQLMethodInvokeExpr x) {
String methodName = x.getMethodName();
if ("len".equalsIgnoreCase(methodName) || "length".equalsIgnoreCase(methodName)) {
Object firstValue = null;
if (x.getParameters().size() > 0) {
firstValue = (getValue(x.getParameters().get(0)));
firstValue = (getValue(visitor, x.getParameters().get(0)));
}
if (firstValue instanceof String) {
@@ -747,20 +760,20 @@ public class WallVisitorUtils {
if ("if".equalsIgnoreCase(methodName) && x.getParameters().size() == 3) {
SQLExpr first = x.getParameters().get(0);
Object firstResult = getValue(first);
Object firstResult = getValue(visitor, first);
if (Boolean.TRUE == firstResult) {
return getValue(x.getParameters().get(1));
return getValue(visitor, x.getParameters().get(1));
}
if (Boolean.FALSE == firstResult) {
getValue(x.getParameters().get(2));
getValue(visitor, x.getParameters().get(2));
}
}
if ("chr".equalsIgnoreCase(methodName) && x.getParameters().size() == 1) {
SQLExpr first = x.getParameters().get(0);
Object firstResult = getValue(first);
Object firstResult = getValue(visitor, first);
if (firstResult instanceof Number) {
int intValue = ((Number) firstResult).intValue();
char ch = (char) intValue;
@@ -772,7 +785,7 @@ public class WallVisitorUtils {
if ("concat".equalsIgnoreCase(methodName)) {
StringBuffer buf = new StringBuffer();
for (SQLExpr expr : x.getParameters()) {
Object value = getValue(expr);
Object value = getValue(visitor, expr);
if (value == null) {
return null;
}
@@ -785,17 +798,17 @@ public class WallVisitorUtils {
return null;
}
public static boolean isSimpleCountTableSource(SQLTableSource tableSource) {
public static boolean isSimpleCountTableSource(WallVisitor visitor, SQLTableSource tableSource) {
if (!(tableSource instanceof SQLSubqueryTableSource)) {
return false;
}
SQLSubqueryTableSource subQuery = (SQLSubqueryTableSource) tableSource;
return isSimpleCountTableSource(subQuery.getSelect());
return isSimpleCountTableSource(visitor, subQuery.getSelect());
}
public static boolean isSimpleCountTableSource(SQLSelect select) {
public static boolean isSimpleCountTableSource(WallVisitor visitor, SQLSelect select) {
SQLSelectQuery query = select.getQuery();
if (query instanceof SQLSelectQueryBlock) {
@@ -806,7 +819,7 @@ public class WallVisitorUtils {
if (queryBlock.getWhere() == null) {
allawTrueWhere = true;
} else {
Object whereValue = getValue(queryBlock.getWhere());
Object whereValue = getValue(visitor, queryBlock.getWhere());
if (whereValue == Boolean.TRUE) {
allawTrueWhere = true;
} else if (whereValue == Boolean.FALSE) {
@@ -846,7 +859,7 @@ public class WallVisitorUtils {
}
if (!visitor.getProvider().checkDenyFunction(methodName)) {
boolean isTopNoneFrom = isTopNoneFromSelect(x);
boolean isTopNoneFrom = isTopNoneFromSelect(visitor, x);
if (isTopNoneFrom) {
return;
}
@@ -898,7 +911,7 @@ public class WallVisitorUtils {
return null;
}
public static boolean isTopNoneFromSelect(SQLObject x) {
public static boolean isTopNoneFromSelect(WallVisitor visitor, SQLObject x) {
if (!(x.getParent() instanceof SQLSelectItem)) {
return false;
}
@@ -909,7 +922,7 @@ public class WallVisitorUtils {
}
SQLSelectQueryBlock queryBlock = (SQLSelectQueryBlock) item.getParent();
if (!queryBlockFromIsNull(queryBlock)) {
if (!queryBlockFromIsNull(visitor, queryBlock)) {
return false;
}
@@ -1086,7 +1099,8 @@ public class WallVisitorUtils {
return;
}
if (WallVisitorUtils.queryBlockFromIsNull(x.getLeft()) || WallVisitorUtils.queryBlockFromIsNull(x.getRight())) {
if (WallVisitorUtils.queryBlockFromIsNull(visitor, x.getLeft())
|| WallVisitorUtils.queryBlockFromIsNull(visitor, x.getRight())) {
boolean isTopUpdateStatement = false;
SQLObject selectParent = x.getParent();
while (selectParent instanceof SQLUnionQuery //
@@ -1103,7 +1117,7 @@ public class WallVisitorUtils {
if (isTopUpdateStatement) {
return;
}
WallContext context = WallContext.current();
if (context != null) {
context.incrementUnionWarnnings();
@@ -1115,7 +1129,7 @@ public class WallVisitorUtils {
}
}
public static boolean queryBlockFromIsNull(SQLSelectQuery query) {
public static boolean queryBlockFromIsNull(WallVisitor visitor, SQLSelectQuery query) {
if (query instanceof SQLSelectQueryBlock) {
SQLSelectQueryBlock queryBlock = (SQLSelectQueryBlock) query;
SQLTableSource from = queryBlock.getFrom();
@@ -1141,7 +1155,7 @@ public class WallVisitorUtils {
&& queryBlock.getSelectList().get(0).getExpr() instanceof SQLAllColumnExpr) {
if (from instanceof SQLSubqueryTableSource) {
SQLSelectQuery subQuery = ((SQLSubqueryTableSource) from).getSelect().getQuery();
if (queryBlockFromIsNull(subQuery)) {
if (queryBlockFromIsNull(visitor, subQuery)) {
return true;
}
}
@@ -1149,7 +1163,7 @@ public class WallVisitorUtils {
boolean allIsConst = true;
for (SQLSelectItem item : queryBlock.getSelectList()) {
if (getValue(item.getExpr()) == null) {
if (getValue(visitor, item.getExpr()) == null) {
allIsConst = false;
break;
}
src/main/java/com/alibaba/druid/wall/violation/ErrorCode.java
+2 -1
View File
@@ -58,7 +58,8 @@ public interface ErrorCode {
public final static int CONST_ARITHMETIC = 2101;
public final static int XOR = 2102;
public final static int BITWISE = 2103;
public final static int NONE_CONDITION = 1200;
public final static int NONE_CONDITION = 2104;
public final static int LIKE_NUMBER = 2105;
public final static int NOT_PARAMETERIZED = 2200;
public final static int MULTI_TENANT = 2201;