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

refactor WallFilter, change permit > deny

Browse Source
This commit is contained in:
wenshao
2013-03-17 09:33:50 +08:00
parent 6efea77807
commit 2308716354
8 changed files with 71 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/wall/WallConfig.java
+65 -48
View File
@@ -17,69 +17,70 @@ package com.alibaba.druid.wall;
import static com.alibaba.druid.wall.spi.WallVisitorUtils.loadResource;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import com.alibaba.druid.wall.spi.WallVisitorUtils;
public class WallConfig implements WallConfigMBean {
private boolean noneBaseStatementAllow = false;
private boolean noneBaseStatementAllow = false;
private boolean callAllow = true;
private boolean selelctAllow = true;
private boolean selectIntoAllow = true;
private boolean selectIntoOutfileAllow = false;
private boolean selectWhereAlwayTrueCheck = true;
private boolean selectHavingAlwayTrueCheck = true;
private boolean selectUnionCheck = true;
private boolean callAllow = true;
private boolean selelctAllow = true;
private boolean selectIntoAllow = true;
private boolean selectIntoOutfileAllow = false;
private boolean selectWhereAlwayTrueCheck = true;
private boolean selectHavingAlwayTrueCheck = true;
private boolean selectUnionCheck = true;
private boolean selectAllColumnAllow = true;
private boolean selectAllColumnAllow = true;
private boolean deleteAllow = true;
private boolean deleteWhereAlwayTrueCheck = true;
private boolean deleteAllow = true;
private boolean deleteWhereAlwayTrueCheck = true;
private boolean updateAllow = true;
private boolean updateWhereAlayTrueCheck = true;
private boolean updateAllow = true;
private boolean updateWhereAlayTrueCheck = true;
private boolean insertAllow = true;
private boolean mergeAllow = true;
private boolean insertAllow = true;
private boolean mergeAllow = true;
private boolean multiStatementAllow = false;
private boolean multiStatementAllow = false;
private boolean truncateAllow = false;
private boolean truncateAllow = false;
private boolean commentAllow = false;
private boolean commentAllow = false;
private boolean describeAllow = false;
private boolean describeAllow = false;
private boolean schemaCheck = true;
private boolean tableCheck = true;
private boolean functionCheck = true;
private boolean objectCheck = true;
private boolean variantCheck = true;
private boolean schemaCheck = true;
private boolean tableCheck = true;
private boolean functionCheck = true;
private boolean objectCheck = true;
private boolean variantCheck = true;
private boolean mustParameterized = false;
private boolean mustParameterized = false;
private boolean doPrivilegedAllow = false;
private boolean doPrivilegedAllow = false;
protected final Set<String> denyFunctions = new HashSet<String>();
protected final Set<String> denyTables = new HashSet<String>();
protected final Set<String> denySchemas = new HashSet<String>();
protected final Set<String> denyVariants = new HashSet<String>();
protected final Set<String> denyObjects = new HashSet<String>();
protected final ConcurrentMap<String, WallDenyStat> denyFunctions = new ConcurrentHashMap<String, WallDenyStat>();
protected final ConcurrentMap<String, WallDenyStat> denyTables = new ConcurrentHashMap<String, WallDenyStat>();
protected final ConcurrentMap<String, WallDenyStat> denySchemas = new ConcurrentHashMap<String, WallDenyStat>();
protected final ConcurrentMap<String, WallDenyStat> denyVariants = new ConcurrentHashMap<String, WallDenyStat>();
protected final ConcurrentMap<String, WallDenyStat> denyObjects = new ConcurrentHashMap<String, WallDenyStat>();
protected final Set<String> readOnlyTables = new HashSet<String>();
protected final ConcurrentMap<String, WallDenyStat> readOnlyTables = new ConcurrentHashMap<String, WallDenyStat>();
private String dir;
private String dir;
private boolean inited;
private boolean inited;
private String tenantTablePattern;
private String tenantColumn;
private String tenantTablePattern;
private String tenantColumn;
private boolean wrapAllow = true;
private boolean metadataAllow = true;
private boolean wrapAllow = true;
private boolean metadataAllow = true;
public WallConfig(){
@@ -358,27 +359,43 @@ public class WallConfig implements WallConfigMBean {
}
public Set<String> getDenyFunctions() {
return denyFunctions;
return denyFunctions.keySet();
}
public Set<String> getDenyTables() {
return denyTables;
return denyTables.keySet();
}
public Set<String> getDenySchemas() {
return denySchemas;
return denySchemas.keySet();
}
public Set<String> getDenyVariants() {
return denyVariants;
return denyVariants.keySet();
}
public Set<String> getDenyObjects() {
return denyObjects;
return denyObjects.keySet();
}
public Set<String> getReadOnlyTables() {
return readOnlyTables;
return readOnlyTables.keySet();
}
public void addReadOnlyTable(String tableName) {
this.readOnlyTables.putIfAbsent(tableName, new WallDenyStat());
}
public boolean checkReadOnly(String tableName) {
WallDenyStat wallStat = this.readOnlyTables.get(tableName);
if (wallStat == null) {
return false;
}
wallStat.incrementAndGetDenyCount();
return true;
}
public boolean isMustParameterized() {
@@ -395,7 +412,7 @@ public class WallConfig implements WallConfigMBean {
}
name = WallVisitorUtils.form(name);
return denyObjects.contains(name);
return denyObjects.containsKey(name);
}
public boolean isDenySchema(String name) {
@@ -404,7 +421,7 @@ public class WallConfig implements WallConfigMBean {
}
name = WallVisitorUtils.form(name);
return this.denySchemas.contains(name);
return this.denySchemas.containsKey(name);
}
public boolean isDenyFunction(String name) {
@@ -413,7 +430,7 @@ public class WallConfig implements WallConfigMBean {
}
name = WallVisitorUtils.form(name);
return this.denyFunctions.contains(name);
return this.denyFunctions.containsKey(name);
}
public boolean isCallAllow() {
src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java
+5 -4
View File
@@ -24,7 +24,7 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLName;
@@ -63,6 +63,7 @@ import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.JdbcUtils;
import com.alibaba.druid.util.ServletPathMatcher;
import com.alibaba.druid.wall.WallDenyStat;
import com.alibaba.druid.wall.WallProvider;
import com.alibaba.druid.wall.WallVisitor;
import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation;
@@ -350,7 +351,7 @@ public class WallVisitorUtils {
if (tableName != null) {
tableName = form(tableName);
if (visitor.getConfig().getReadOnlyTables().contains(tableName)) {
if (visitor.getConfig().checkReadOnly(tableName)) {
addViolation(visitor, tableSource);
}
}
@@ -850,7 +851,7 @@ public class WallVisitorUtils {
return name;
}
public static void loadResource(Set<String> names, String resource) {
public static void loadResource(ConcurrentMap<String, WallDenyStat> names, String resource) {
try {
Enumeration<URL> e = Thread.currentThread().getContextClassLoader().getResources(resource);
while (e.hasMoreElements()) {
@@ -868,7 +869,7 @@ public class WallVisitorUtils {
line = line.trim();
if (line.length() > 0) {
line = line.toLowerCase();
names.add(line);
names.put(line, new WallDenyStat());
}
}