Merge pull request #1861 from Lonzak/main

[TIKA-4283] - Implemented support for JKS Java Keystore format
apache · Jul 24, 2024 · 7bcbeba · 7bcbeba
1 parent 954f642
commit 7bcbeba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
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
@@ -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/...ndard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java b/...ndard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
@@ -1227,6 +1227,7 @@ public void testCertificatesKeys() throws Exception {
         // 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/...ers-standard/tika-parsers-standard-package/src/test/resources/test-documents/KeyStore.jks b/...ers-standard/tika-parsers-standard-package/src/test/resources/test-documents/KeyStore.jks