You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ti...@apache.org on 2024/07/24 09:35:01 UTC
(tika) branch branch_2x updated: Merge pull request #1861 from Lonzak/main
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch branch_2x
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/branch_2x by this push:
new 7bcbeba16 Merge pull request #1861 from Lonzak/main
7bcbeba16 is described below
commit 7bcbeba1635af80b805086ecdefb8ebb2eb82839
Author: Tilman Hausherr <ti...@snafu.de>
AuthorDate: Wed Jul 24 11:26:11 2024 +0200
Merge pull request #1861 from Lonzak/main
[TIKA-4283] - Implemented support for JKS Java Keystore format
---
.../resources/org/apache/tika/mime/tika-mimetypes.xml | 9 +++++++++
.../test/java/org/apache/tika/mime/TestMimeTypes.java | 1 +
.../src/test/resources/test-documents/KeyStore.jks | Bin 0 -> 2249 bytes
3 files changed, 10 insertions(+)
diff --git a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
index 8e1956cd3..62e3d56ca 100644
--- a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
+++ b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
@@ -5189,6 +5189,15 @@
<match value="-----BEGIN EC PARAMETERS-----" type="string" offset="0"/>
</magic>
</mime-type>
+ <mime-type type="application/x-java-keystore">
+ <_comment>Java Keystore</_comment>
+ <tika:link>https://en.wikipedia.org/wiki/Java_KeyStore</tika:link>
+ <magic priority="50">
+ <!-- magic byte: https://en.wikipedia.org/wiki/List_of_file_signatures -->
+ <match value="0xfeedfeed" type="string" offset="0:4"/>
+ </magic>
+ <glob pattern="*.jks" />
+ </mime-type>
<mime-type type="application/x-xfig">
<glob pattern="*.fig"/>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
index bc81c7094..adf28e341 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
@@ -1227,6 +1227,7 @@ public class TestMimeTypes {
// Once solved, see TIKA-3784, ought to work for name or data
//assertType("application/x-pkcs12", "testRSAKEYandCERT.p12");
//assertTypeByData("application/x-pkcs12", "testRSAKEYandCERT.p12"); // pass=tika
+ assertTypeByData("application/x-java-keystore", "KeyStore.jks");
}
@Test
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/KeyStore.jks b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/KeyStore.jks
new file mode 100644
index 000000000..2e6419c0a
Binary files /dev/null and b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/KeyStore.jks differ