Merge branch '2.15'

Author: cowtowncoder

smile/src/main/java/tools/jackson/dataformat/smile/SmileParser.java

@@ -520,7 +520,7 @@ public JsonToken nextToken() throws JacksonException
                 }
                 return _handleSharedString(((ch & 0x3) << 8) + (_inputBuffer[_inputPtr++] & 0xFF));
             case 0x18: // START_ARRAY
-                _streamReadContext = _streamReadContext.createChildArrayContext(-1, -1);
+                createChildArrayContext(-1, -1);
                 return (_currToken = JsonToken.START_ARRAY);
             case 0x19: // END_ARRAY
                 if (!_streamReadContext.inArray()) {
@@ -529,7 +529,7 @@ public JsonToken nextToken() throws JacksonException
                 _streamReadContext = _streamReadContext.getParent();
                 return (_currToken = JsonToken.END_ARRAY);
             case 0x1A: // START_OBJECT
-                _streamReadContext = _streamReadContext.createChildObjectContext(-1, -1);
+                createChildObjectContext(-1, -1);
                 return (_currToken = JsonToken.START_OBJECT);
             case 0x1B: // not used in this mode; would be END_OBJECT
                 throw _constructReadException("Invalid type marker byte 0xFB in value mode (would be END_OBJECT in key mode)");
@@ -3432,5 +3432,15 @@ private final JsonToken _eofAsNextToken() throws JacksonException {
         close();
         return (_currToken = null);
     }
+
+    private void createChildArrayContext(final int lineNr, final int colNr) throws JacksonException {
+        _streamReadContext = _streamReadContext.createChildArrayContext(lineNr, colNr);
+        streamReadConstraints().validateNestingDepth(_streamReadContext.getNestingDepth());
+    }
+
+    private void createChildObjectContext(final int lineNr, final int colNr) throws JacksonException {
+        _streamReadContext = _streamReadContext.createChildObjectContext(lineNr, colNr);
+        streamReadConstraints().validateNestingDepth(_streamReadContext.getNestingDepth());
+    }
 }
 

smile/src/test/java/tools/jackson/dataformat/smile/dos/DeepNestingParserTest.java

@@ -0,0 +1,112 @@
+package tools.jackson.dataformat.smile.dos;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import tools.jackson.core.*;
+import tools.jackson.core.exc.StreamConstraintsException;
+import tools.jackson.dataformat.smile.BaseTestForSmile;
+import tools.jackson.dataformat.smile.SmileFactory;
+import tools.jackson.dataformat.smile.databind.SmileMapper;
+
+/**
+ * Unit tests for deeply nested JSON
+ */
+public class DeepNestingParserTest extends BaseTestForSmile
+{
+    SmileMapper DEFAULT_MAPPER = newSmileMapper();
+
+    SmileMapper UNCONSTRAINED_MAPPER;
+    {
+        SmileFactory smileFactory = SmileFactory.builder()
+                .streamReadConstraints(StreamReadConstraints.builder().maxNestingDepth(Integer.MAX_VALUE).build())
+                .build();
+        UNCONSTRAINED_MAPPER = new SmileMapper(smileFactory);
+    }
+
+    public void testDeeplyNestedObjects() throws Exception
+    {
+        final int depth = 1500;
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        genDeepDoc(out, depth);
+        try (JsonParser jp = DEFAULT_MAPPER.createParser(out.toByteArray())) {
+            JsonToken jt;
+            while ((jt = jp.nextToken()) != null) {
+
+            }
+            fail("expected StreamConstraintsException");
+        } catch (StreamConstraintsException e) {
+            assertEquals("Depth (1001) exceeds the maximum allowed nesting depth (1000)", e.getMessage());
+        }
+    }
+
+    public void testDeeplyNestedObjectsWithUnconstrainedMapper() throws Exception
+    {
+        final int depth = 1500;
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        genDeepDoc(out, depth);
+        try (JsonParser jp = UNCONSTRAINED_MAPPER.createParser(out.toByteArray())) {
+            JsonToken jt;
+            while ((jt = jp.nextToken()) != null) {
+
+            }
+        }
+    }
+
+    public void testDeeplyNestedArrays() throws Exception
+    {
+        final int depth = 750;
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        genDeepArrayDoc(out, depth);
+        try (JsonParser jp = DEFAULT_MAPPER.createParser(out.toByteArray())) {
+            JsonToken jt;
+            while ((jt = jp.nextToken()) != null) {
+
+            }
+            fail("expected StreamConstraintsException");
+        } catch (StreamConstraintsException e) {
+            assertEquals("Depth (1001) exceeds the maximum allowed nesting depth (1000)", e.getMessage());
+        }
+    }
+
+    public void testDeeplyNestedArraysWithUnconstrainedMapper() throws Exception
+    {
+        final int depth = 750;
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        genDeepArrayDoc(out, depth);
+        try (JsonParser jp = UNCONSTRAINED_MAPPER.createParser(out.toByteArray())) {
+            JsonToken jt;
+            while ((jt = jp.nextToken()) != null) {
+
+            }
+        }
+    }
+
+    private void genDeepDoc(final ByteArrayOutputStream out, final int depth) throws IOException {
+        try (JsonGenerator gen = _smileGenerator(out, true)) {
+            for (int i = 0; i < depth; i++) {
+                gen.writeStartObject();
+                gen.writeName("a");
+            }
+            gen.writeString("val");
+            for (int i = 0; i < depth; i++) {
+                gen.writeEndObject();
+            }
+        }
+    }
+
+    private void genDeepArrayDoc(final ByteArrayOutputStream out, final int depth) throws IOException {
+        try (JsonGenerator gen = _smileGenerator(out, true)) {
+            for (int i = 0; i < depth; i++) {
+                gen.writeStartObject();
+                gen.writeName("a");
+                gen.writeStartArray();
+            }
+            gen.writeString("val");
+            for (int i = 0; i < depth; i++) {
+                gen.writeEndArray();
+                gen.writeEndObject();
+            }
+        }
+    }
+}