You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2018/11/30 21:30:17 UTC
[tika] 02/02: TIKA-2550 -- prevent content in style/script elements
from being written in ToTextContentHandler
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 6b5dd8bbe09eb099ec75846ec02391cbd32351c4
Author: TALLISON <ta...@apache.org>
AuthorDate: Fri Nov 30 16:23:36 2018 -0500
TIKA-2550 -- prevent content in style/script elements from being written in ToTextContentHandler
---
CHANGES.txt | 3 ++
.../org/apache/tika/sax/ToTextContentHandler.java | 43 +++++++++++++++++++++-
.../tika/parser/code/SourceCodeParserTest.java | 33 ++++++++++++++---
3 files changed, 72 insertions(+), 7 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 843b25b..750a5c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,9 @@ Release 2.0.0 - ???
Release 1.20 - ???
+ * Prevent content within <style/> and <script/> elements
+ to be written in the ToTextContentHandler (TIKA-2550).
+
* Switch child to parent communication to a shared memory-mapped
file in tika-server's -spawnChild mode.
diff --git a/tika-core/src/main/java/org/apache/tika/sax/ToTextContentHandler.java b/tika-core/src/main/java/org/apache/tika/sax/ToTextContentHandler.java
index 4fdeaf3..530eb90 100755
--- a/tika-core/src/main/java/org/apache/tika/sax/ToTextContentHandler.java
+++ b/tika-core/src/main/java/org/apache/tika/sax/ToTextContentHandler.java
@@ -23,7 +23,9 @@ import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.nio.charset.Charset;
+import java.util.Locale;
+import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
@@ -31,11 +33,19 @@ import org.xml.sax.helpers.DefaultHandler;
* SAX event handler that writes all character content out to a character
* stream. No escaping or other transformations are made on the character
* content.
- *
+ * <p>
+ * As of Tika 1.20, this handler ignores content within <script> and
+ * <style> tags.
+ *</p>
* @since Apache Tika 0.10
*/
public class ToTextContentHandler extends DefaultHandler {
+ private static final String STYLE = "STYLE";
+ private static final String SCRIPT = "SCRIPT";
+ private int styleDepth = 0;
+ private int scriptDepth = 0;
+
/**
* The character stream.
*/
@@ -89,6 +99,11 @@ public class ToTextContentHandler extends DefaultHandler {
@Override
public void characters(char[] ch, int start, int length)
throws SAXException {
+
+ if (styleDepth+scriptDepth != 0) {
+ return;
+ }
+
try {
writer.write(ch, start, length);
} catch (IOException e) {
@@ -125,6 +140,32 @@ public class ToTextContentHandler extends DefaultHandler {
}
}
+ @Override
+ public void startElement(
+ String uri, String localName, String qName, Attributes atts)
+ throws SAXException {
+ String uc = (qName == null) ? "" : qName.toUpperCase(Locale.ENGLISH);
+ if (uc.equals(STYLE)) {
+ styleDepth++;
+ }
+ if (uc.equals(SCRIPT)) {
+ scriptDepth++;
+ }
+ }
+
+ @Override
+ public void endElement(
+ String uri, String localName, String qName)
+ throws SAXException {
+ String uc = (qName == null) ? "" : qName.toUpperCase(Locale.ENGLISH);
+ if (uc.equals(STYLE)) {
+ styleDepth--;
+ }
+ if (uc.equals(SCRIPT)) {
+ scriptDepth--;
+ }
+ }
+
/**
* Returns the contents of the internal string buffer where
* all the received characters have been collected. Only works
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java
index e6af91d..5c791f4 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java
+++ b/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java
@@ -17,12 +17,16 @@
package org.apache.tika.parser.code;
import org.apache.tika.TikaTest;
+import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.ParseContext;
+import org.apache.tika.parser.Parser;
+import org.apache.tika.sax.ToTextContentHandler;
import org.junit.Test;
+import org.xml.sax.ContentHandler;
import java.io.ByteArrayInputStream;
import java.util.Set;
@@ -91,11 +95,28 @@ public class SourceCodeParserTest extends TikaTest {
assertTrue(strContent.indexOf("public class HelloWorld {") > 0);
}
- private Metadata createMetadata(String mimeType) {
- Metadata metadata = new Metadata();
- metadata.add(TikaCoreProperties.RESOURCE_NAME_KEY, "testFile");
- metadata.add(Metadata.CONTENT_TYPE, mimeType);
- return metadata;
- }
+ @Test
+ public void testNoMarkupInToTextHandler() throws Exception {
+
+ Parser p = new AutoDetectParser();
+ ContentHandler contentHandler = new ToTextContentHandler();
+ ParseContext parseContext = new ParseContext();
+ try (TikaInputStream tis = TikaInputStream.get(
+ getResourceAsStream("/test-documents/testJAVA.java"))) {
+ p.parse(tis, contentHandler, createMetadata("text/x-java-source"),
+ parseContext);
+ }
+ String strContent = contentHandler.toString();
+ assertContains("public class HelloWorld {", strContent);
+ assertNotContained("background-color", strContent);
+ }
+
+
+ private Metadata createMetadata(String mimeType) {
+ Metadata metadata = new Metadata();
+ metadata.add(TikaCoreProperties.RESOURCE_NAME_KEY, "testFile");
+ metadata.add(Metadata.CONTENT_TYPE, mimeType);
+ return metadata;
+ }
}