'#1978 Add support to "application/x-x509-cert", as tika started to

classify DER and PEM encoded certificates as this kind of mimetype. Other minor formatting changes were included.
sepinf-inc · Nov 14, 2023 · e532223 · e532223
1 parent 34d1721
commit e532223
Showing 1 changed file with 31 additions and 3 deletions.
diff --git a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/security/CertificateParser.java b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/security/CertificateParser.java
@@ -41,30 +41,46 @@
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
+import iped.parsers.util.MetadataUtil;
+
 public class CertificateParser extends AbstractParser {
     /**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
+
+    public static final MediaType X509_MIME = MediaType.application("x-x509-cert");
+
+    // these are old mimetypes before TIKA had implemented its mimetype
+    // x-x509-ca-cert
+    @Deprecated
 	public static final MediaType PEM_MIME = MediaType.application("x-pem-file");
+    @Deprecated
     public static final MediaType DER_MIME = MediaType.application("pkix-cert");
+
     private static final MediaType PKCS7_MIME = MediaType.application("pkcs7-mime");
     public static final MediaType PKCS7_SIGNATURE = MediaType.application("pkcs7-signature");
     private static Set<MediaType> SUPPORTED_TYPES = null;
 
-    public static final Property NOTBEFORE = Property.internalDate("certificate:notbefore"); //$NON-NLS-1$
-    public static final Property NOTAFTER = Property.internalDate("certificate:notafter"); //$NON-NLS-1$
+    public static final Property NOTBEFORE = Property.internalDate("certificate:notBefore"); //$NON-NLS-1$
+    public static final Property NOTAFTER = Property.internalDate("certificate:notAfter"); //$NON-NLS-1$
     public static final String ISSUER = "certificate:issuer"; //$NON-NLS-1$
     public static final String SUBJECT = "certificate:subject"; //$NON-NLS-1$
     public static final Property ISSUBJECTAUTHORITY = Property.internalBoolean("certificate:subjectIsCertAuthority"); //$NON-NLS-1$
     public static final String NOALTNAMES = "This certificate has no alternative names.";
 
+    public CertificateParser() {
+        MetadataUtil.setMetadataType(NOTBEFORE.getName(), Date.class);
+        MetadataUtil.setMetadataType(NOTAFTER.getName(), Date.class);
+    }
+
     @Override
     public Set<MediaType> getSupportedTypes(ParseContext arg0) {
         if (SUPPORTED_TYPES == null) {
             Set<MediaType> set = new HashSet<>();
             set.add(PEM_MIME);
             set.add(DER_MIME);
+            set.add(X509_MIME);
             set.add(PKCS7_MIME);
             set.add(PKCS7_SIGNATURE);
             SUPPORTED_TYPES = set;
@@ -92,11 +108,18 @@ public void parse(InputStream stream, ContentHandler handler, Metadata metadata,
                     List certs = p.getCertificates();
                     XHTMLContentHandler xhtml = new XHTMLContentHandler(handler, metadata);
                     xhtml.startDocument();
+                    xhtml.startElement("head"); //$NON-NLS-1$
+                    xhtml.startElement("style"); //$NON-NLS-1$
+                    xhtml.characters("table {border-collapse: collapse;} table, td, th {border: 1px solid black;}"); //$NON-NLS-1$
+                    xhtml.endElement("style"); //$NON-NLS-1$
+                    xhtml.endElement("head"); //$NON-NLS-1$
                     for (Iterator iterator = certs.iterator(); iterator.hasNext();) {
                         cert = (X509Certificate) iterator.next();
                         generateCertificateHtml(cert, xhtml);
                     }
                     xhtml.endDocument();
+                    cert = (X509Certificate) certs.iterator().next();// gets the first certificate as this is more
+                                                                     // specific
                 }
             } else {
                 InputStream certStream = null;
@@ -110,6 +133,11 @@ public void parse(InputStream stream, ContentHandler handler, Metadata metadata,
                 }
                 XHTMLContentHandler xhtml = new XHTMLContentHandler(handler, metadata);
                 xhtml.startDocument();
+                xhtml.startElement("head"); //$NON-NLS-1$
+                xhtml.startElement("style"); //$NON-NLS-1$
+                xhtml.characters("table {border-collapse: collapse;} table, td, th {border: 1px solid black;}"); //$NON-NLS-1$
+                xhtml.endElement("style"); //$NON-NLS-1$
+                xhtml.endElement("head"); //$NON-NLS-1$
                 generateCertificateHtml(cert, xhtml);
                 xhtml.endDocument();
             }
@@ -136,7 +164,7 @@ public void parse(InputStream stream, ContentHandler handler, Metadata metadata,
     private void generateCertificateHtml(X509Certificate cert, XHTMLContentHandler xhtml)
             throws UnsupportedEncodingException, SAXException {
 
-        xhtml.startElement("table");
+        xhtml.startElement("table border='1'");
 
         xhtml.startElement("tr");
         xhtml.startElement("th");