add control only when parsing an object dynamically:

?

Author: drempapis

server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java

@@ -363,6 +363,8 @@ private static void innerParseObject(DocumentParserContext context) throws IOExc
         XContentParser.Token token = parser.currentToken();
         String currentFieldName = null;
         assert token == XContentParser.Token.FIELD_NAME || token == XContentParser.Token.END_OBJECT;
+        int countArray = 0;
+        long arrayObjectsLimit = context.indexSettings().getMappingArrayObjectsLimit();
         while (token != XContentParser.Token.END_OBJECT) {
             if (token == null) {
                 throwEOF(context.parent(), context);
@@ -378,7 +380,7 @@ private static void innerParseObject(DocumentParserContext context) throws IOExc
                     }
                     break;
                 case START_OBJECT:
-                    parseObject(context, currentFieldName);
+                    countArray = parseObject(context, currentFieldName, arrayObjectsLimit, countArray);
                     break;
                 case START_ARRAY:
                     parseArray(context, currentFieldName);
@@ -519,15 +521,30 @@ private static void throwOnCopyToOnObject(Mapper mapper, List<String> copyToFiel
         );
     }
 
-    private static void parseObject(final DocumentParserContext context, String currentFieldName) throws IOException {
+    private static int parseObject(final DocumentParserContext context,
+                                   String currentFieldName,
+                                   long arrayObjectsLimit,
+                                   int alreadyCounted) throws IOException {
+        int newCount = 0;
         assert currentFieldName != null;
         context.setImmediateXContentParent(context.parser().currentToken());
         Mapper objectMapper = context.getMapper(currentFieldName);
         if (objectMapper != null) {
             doParseObject(context, currentFieldName, objectMapper);
         } else {
+            newCount = alreadyCounted + 1;
+            if (newCount > arrayObjectsLimit) {
+                throw new IllegalStateException(
+                    "The number of array objects has exceeded the allowed limit of ["
+                        + arrayObjectsLimit
+                        + "]. This limit can be set by changing the ["
+                        + MapperService.INDEX_MAPPING_ARRAY_OBJECTS_LIMIT_SETTING.getKey()
+                        + "] index level setting."
+                );
+            }
             parseObjectDynamic(context, currentFieldName);
         }
+        return newCount;
     }
 
     private static void doParseObject(DocumentParserContext context, String currentFieldName, Mapper objectMapper) throws IOException {
@@ -754,18 +771,8 @@ private static void parseNonDynamicArray(
         long arrayObjectsLimit = context.indexSettings().getMappingArrayObjectsLimit();
         while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) {
             if (token == XContentParser.Token.START_OBJECT) {
-                if (countArray++ >= arrayObjectsLimit) {
-                    throw new IllegalStateException(
-                        "The number of array objects has exceeded the allowed limit of ["
-                            + arrayObjectsLimit
-                            + "]. "
-                            + "This limit can be set by changing the ["
-                            + MapperService.INDEX_MAPPING_ARRAY_OBJECTS_LIMIT_SETTING.getKey()
-                            + "] index level setting."
-                    );
-                }
                 elements = 2;
-                parseObject(context, lastFieldName);
+                countArray = parseObject(context, lastFieldName, arrayObjectsLimit, countArray);
             } else if (token == XContentParser.Token.START_ARRAY) {
                 elements = 2;
                 parseArray(context, lastFieldName);