TIKA-4453 -- decrement embedded depth in rpwh via Stephen H (#2277)

Author: tballison

tika-core/src/main/java/org/apache/tika/fork/RecursiveMetadataContentHandlerProxy.java

@@ -72,6 +72,7 @@ public void init(DataInputStream input, DataOutputStream output) {
     public void endEmbeddedDocument(ContentHandler contentHandler, Metadata metadata)
             throws SAXException {
         proxyBackToClient(EMBEDDED_DOCUMENT, contentHandler, metadata);
+        decrementEmbeddedDepth();
     }
 
     @Override

tika-core/src/main/java/org/apache/tika/sax/AbstractRecursiveParserWrapperHandler.java

@@ -94,6 +94,14 @@ public void endEmbeddedDocument(ContentHandler contentHandler, Metadata metadata
         embeddedDepth--;
     }
 
+    /**
+     * This is called by RecursiveMetadataContentHandlerProxy as it
+     * cannot call endEmbeddedDocument().
+     */
+    protected void decrementEmbeddedDepth() {
+        embeddedDepth--;
+    }
+
     /**
      * This is called after the full parse has completed.  Override this
      * for custom behavior.  Make sure to call this as <code>super.endDocument(...)</code>

tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java

@@ -278,6 +278,35 @@ public void testRecursiveParserWrapper() throws Exception {
         assertEquals("/embed1.xml", m1.get(TikaCoreProperties.EMBEDDED_RESOURCE_PATH));
     }
 
+    @Test
+    public void testRecursiveParserWrapperMassiveEmbedded() throws Exception {
+        Parser parser = new AutoDetectParser();
+        RecursiveParserWrapper wrapper = new RecursiveParserWrapper(parser);
+        RecursiveParserWrapperHandler handler = new RecursiveParserWrapperHandler(
+                new BasicContentHandlerFactory(BasicContentHandlerFactory.HANDLER_TYPE.TEXT,
+                        20000));
+        try (ForkParser fork = new ForkParser(ForkParserTest.class.getClassLoader(), wrapper);
+                InputStream is = getResourceAsStream("/test-documents/massive_embedded.xml")) {
+            Metadata metadata = new Metadata();
+            ParseContext context = new ParseContext();
+            fork.parse(is, handler, metadata, context);
+        }
+        List<Metadata> metadataList = handler.getMetadataList();
+        assertEquals(111, metadataList.size());
+        Metadata m0 = metadataList.get(0);
+        assertEquals("Nikolai Lobachevsky", m0.get(TikaCoreProperties.CREATOR));
+        assertContains("main_content", m0.get(TikaCoreProperties.TIKA_CONTENT));
+
+        for (int i = 1; i <= 110; i++) {
+            assertContains("embed" + i + ".xml", m0.get(TikaCoreProperties.TIKA_CONTENT));
+
+            Metadata m1 = metadataList.get(i);
+            assertEquals("embeddedAuthor", m1.get(TikaCoreProperties.CREATOR));
+            assertContains("some_embedded_content", m1.get(TikaCoreProperties.TIKA_CONTENT));
+            assertEquals("/embed" + i + ".xml", m1.get(TikaCoreProperties.EMBEDDED_RESOURCE_PATH));
+        }
+    }
+
     @Test
     public void testRPWWithEmbeddedNPE() throws Exception {
         Parser parser = new AutoDetectParser();