TIKA-4310 -- add CloseShieldInputStream to JsoupParser to ensure that…

… underlying stream is not closed
apache · Sep 16, 2024 · 9492c47 · 9492c47
1 parent 10dc7f6
commit 9492c47
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/...odules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/JSoupParser.java b/...odules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/JSoupParser.java
@@ -27,6 +27,7 @@
 import java.util.Set;
 import javax.xml.XMLConstants;
 
+import org.apache.commons.io.input.CloseShieldInputStream;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Attribute;
 import org.jsoup.nodes.DataNode;
@@ -127,7 +128,7 @@ public void parse(InputStream stream, ContentHandler handler, Metadata metadata,
         HtmlMapper mapper = context.get(HtmlMapper.class, new DefaultHtmlMapper());
 
         //do better with baseUri?
-        Document document = Jsoup.parse(stream, charset.name(), "");
+        Document document = Jsoup.parse(CloseShieldInputStream.wrap(stream), charset.name(), "");
         document.quirksMode(Document.QuirksMode.quirks);
         ContentHandler xhtml = new XHTMLDowngradeHandler(
                 new HtmlHandler(mapper, handler, metadata, context, extractScripts));

diff --git a/...les/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java b/...les/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
@@ -32,6 +32,7 @@
 import java.io.Writer;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -78,6 +79,7 @@
 import org.apache.tika.sax.BasicContentHandlerFactory;
 import org.apache.tika.sax.BodyContentHandler;
 import org.apache.tika.sax.TeeContentHandler;
+import org.apache.tika.sax.WriteOutContentHandler;
 
 public class HtmlParserTest extends TikaTest {
 
@@ -1243,6 +1245,20 @@ public void testPreferenceForTitleElement() throws Exception {
         assertEquals("OldMetaTitle", m.get("title"));
     }
 
+    @Test
+    public void testStreamNotClosed() throws Exception {
+        String path = "/test-documents/testHTML.html";
+        Metadata metadata = new Metadata();
+        Path tmp = null;
+        try (TikaInputStream stream = TikaInputStream.get(getResourceAsStream(path))) {
+            //spool tika stream to disk
+            tmp = stream.getPath();
+            new JSoupParser().parse(stream, new WriteOutContentHandler(), metadata, new ParseContext());
+            //make sure that the tmp file is still there
+            assertTrue(Files.isRegularFile(tmp));
+        }
+    }
+
     private class EncodingDetectorRunner implements Callable<String> {
 
         final static String DONE = "done";