Author: nick
Date: Fri Jan 16 00:06:37 2015
New Revision: 1652317
URL: http://svn.apache.org/r1652317
Log:
TIKA-1028 If an encrypted attachment is found in a RFC822 email, silently skip
it and carry on, so the rest of the email can be processed (may need more work!)
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java?rev=1652317&r1=1652316&r2=1652317&view=diff
==============================================================================
---
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java
(original)
+++
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java
Fri Jan 16 00:06:37 2015
@@ -36,6 +36,7 @@ import org.apache.james.mime4j.parser.Co
import org.apache.james.mime4j.stream.BodyDescriptor;
import org.apache.james.mime4j.stream.Field;
import org.apache.tika.config.TikaConfig;
+import org.apache.tika.exception.EncryptedDocumentException;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
@@ -100,6 +101,8 @@ class MailContentHandler implements Cont
try {
BodyContentHandler bch = new BodyContentHandler(handler);
parser.parse(is, new EmbeddedContentHandler(bch), submd, context);
+ } catch (EncryptedDocumentException ede) {
+ // Skip this encrypted attachment and continue
} catch (SAXException e) {
throw new MimeException(e);
} catch (TikaException e) {
