Server:Parser新增maxQueryDepth限制，优化maxObjectCount和maxArrayCount限制

TommyLemon · TommyLemon · commit 335879d9cb58 · 2019-04-25T22:58:25.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractObjectParser.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractObjectParser.java
@@ -486,11 +486,12 @@ public JSON onChildParse(int index, String key, JSONObject value) throws Excepti
 		boolean isEmpty;
 
 		if (zuo.biao.apijson.JSONObject.isArrayKey(key)) {//APIJSON Array
-			arrayCount ++;
-			
 			int maxArrayCount = parser.getMaxArrayCount();
 			if (arrayCount > maxArrayCount) {
-				throw new IllegalArgumentException(path + " 内 key[]: {} 的数量必须在 0-" + maxArrayCount + " 内 !");
+				throw new IllegalArgumentException(path + " 内 key[]:{} 的数量 为 " + arrayCount + " 已超限，必须在 0-" + maxArrayCount + " 内 !");
+			}
+			if (arrayConfig == null || arrayConfig.getPosition() == 0) {
+				arrayCount ++;
 			}
 			
 			if (isMain) {
@@ -502,11 +503,12 @@ public JSON onChildParse(int index, String key, JSONObject value) throws Excepti
 			isEmpty = child == null || ((JSONArray) child).isEmpty();
 		}
 		else {//APIJSON Object
-			objectCount ++;
-
 			int maxObjectCount = parser.getMaxObjectCount();
 			if (objectCount > maxObjectCount) {
-				throw new IllegalArgumentException(path + " 内 key: {} 的数量必须在 0-" + maxObjectCount + " 内 !");
+				throw new IllegalArgumentException(path + " 内 TableKey:{} 的数量 为 " + objectCount + " 已超限，必须在 0-" + maxObjectCount + " 内 !");
+			}
+			if (arrayConfig == null || arrayConfig.getPosition() == 0) {
+				arrayCount ++;
 			}
 			
 			if (type == TYPE_ITEM && JSONRequest.isTableKey(Pair.parseEntry(key, true).getKey()) == false) {
@@ -614,7 +616,7 @@ public AbstractObjectParser setSQLConfig(int count, int page, int position) thro
 			sqlCount ++;
 			int maxSQLCount = parser.getMaxSQLCount();
 			if (sqlCount > maxSQLCount) {
-				throw new IllegalArgumentException(path + " 内生成的 SQL 必须在 0-" + maxSQLCount + " 内 !");
+				throw new IllegalArgumentException(path + " 内生成的 SQL 为 " + sqlCount + " 已超限，必须在 0-" + maxSQLCount + " 内 !");
 			}
 			
 			sqlConfig = newSQLConfig();
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractParser.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractParser.java
@@ -239,7 +239,7 @@ public JSONObject parseResponse(String request) {
 		return parseResponse(requestObject);
 	}
 
-	private int depth;
+	private int queryDepth;
 	/**解析请求json并获取对应结果
 	 * @param request
 	 * @return requestObject
@@ -298,7 +298,7 @@ public JSONObject parseResponse(JSONObject request) {
 		Exception error = null;
 		sqlExecutor = createSQLExecutor();
 		try {
-			depth = 0;
+			queryDepth = 0;
 			requestObject = onObjectParse(request, null, null, null, false);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -628,6 +628,14 @@ public JSONObject onObjectParse(final JSONObject request
 			return null;
 		}
 
+		if (arrayConfig == null || arrayConfig.getPosition() == 0) {
+			int maxQueryDepth = getMaxQueryDepth();
+			if (queryDepth > maxQueryDepth) {
+				throw new IllegalArgumentException(parentPath + "/" + name + ":{} 的深度(或者说层级) 为 " + queryDepth + " 已超限，必须在 0-" + maxQueryDepth + " 内 !");
+			}
+			queryDepth ++;
+		}
+
 		int type = arrayConfig == null ? 0 : arrayConfig.getType();
 
 		ObjectParser op = createObjectParser(request, parentPath, name, arrayConfig, isSubquery).parse();
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/Parser.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/Parser.java
@@ -30,8 +30,8 @@ public interface Parser<T> {
 	int MAX_QUERY_COUNT = 100;
 	int MAX_UPDATE_COUNT = 10;
 	int MAX_SQL_COUNT = 100;
-	int MAX_OBJECT_COUNT = 3;
-	int MAX_ARRAY_COUNT = 3;
+	int MAX_OBJECT_COUNT = 5;
+	int MAX_ARRAY_COUNT = 5;
 	int MAX_QUERY_DEPTH = 3;
 	
 	
