[tika] branch master updated: TIKA-2982 -- don't require 'DataSpaces' in ooxml-encrypted detection

[tallison]

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


The following commit(s) were added to refs/heads/master by this push:
     new f6a5749  TIKA-2982 -- don't require 'DataSpaces' in ooxml-encrypted 
detection
f6a5749 is described below

commit f6a57491fa1de007462df2b08f60cbe094361e12
Author: tallison <talli...@apache.org>
AuthorDate: Wed Nov 13 09:09:08 2019 -0800

    TIKA-2982 -- don't require 'DataSpaces' in ooxml-encrypted detection
---
 .../org/apache/tika/parser/microsoft/POIFSContainerDetector.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/POIFSContainerDetector.java
 
b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/POIFSContainerDetector.java
index ca5e6f3..d7ac766 100644
--- 
a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/POIFSContainerDetector.java
+++ 
b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/POIFSContainerDetector.java
@@ -260,13 +260,15 @@ public class POIFSContainerDetector implements Detector {
                 // Excel 95 or older, we won't be able to parse this....
                 return XLS;
             } else if (names.contains("EncryptedPackage") &&
-                    names.contains("EncryptionInfo") &&
-                    names.contains("\u0006DataSpaces")) {
+                    names.contains("EncryptionInfo")) {
                 // This is a protected OOXML document, which is an OLE2 file
                 //  with an Encrypted Stream which holds the OOXML data
                 // Without decrypting the stream, we can't tell what kind of
                 //  OOXML file we have. Return a general OOXML Protected type,
                 //  and hope the name based detection can guess the rest!
+
+                //Until Tika 1.23, we also required: && 
names.contains("\u0006DataSpaces")
+                //See TIKA-2982
                 return OOXML_PROTECTED;
             } else if (names.contains("EncryptedPackage")) {
                 return OLE;