This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git

commit d8113db2b3204b596779d7aaf358bd0146872060
Author: tallison <[email protected]>
AuthorDate: Wed Apr 20 13:24:59 2022 -0400

    TIKA-3666 -- add encrypted document exception if we haven't identified the 
file type and there is an EncryptedPackage.
---
 .../src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git 
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java
 
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java
index 2f0c9245d..a155e470c 100644
--- 
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java
+++ 
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java
@@ -277,6 +277,10 @@ public class OfficeParser extends AbstractOfficeParser {
                 throw new EncryptedDocumentException("DRM encrypted document 
is not yet supported" +
                         " by Apache POI");
             default:
+                if (root.hasEntry("EncryptedPackage")) {
+                    throw new EncryptedDocumentException("OLE2 file with an 
unrecognized " +
+                            "EncryptedPackage entry");
+                }
                 // For unsupported / unhandled types, just the metadata
                 //  is extracted, which happened above
                 break;

Reply via email to