From b035f6c4106b383745981aa9d3ab3b29f96f6093 Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Mon, 22 Jan 2018 19:57:41 +0000
Subject: [PATCH] Added detection patterns for X.509 certs, Morse Code, Tar,
 images and BCD.

---
 src/core/config/OperationConfig.js | 63 +++++++++++++++---------------
 src/core/operations/PublicKey.js   |  6 ++-
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/src/core/config/OperationConfig.js b/src/core/config/OperationConfig.js
index 6a95325e..d6ecaf17 100755
--- a/src/core/config/OperationConfig.js
+++ b/src/core/config/OperationConfig.js
@@ -3618,12 +3618,12 @@ const OperationConfig = {
                 value: PublicKey.X509_INPUT_FORMAT
             }
         ],
-        patterns: [ // TODO
-            //{
-            //    match: "^$",
-            //    flags: "",
-            //    args: []
-            //},
+        patterns: [
+            {
+                match: "^-+BEGIN CERTIFICATE-+\\r?\\n[\\da-z+/\\n\\r]+-+END CERTIFICATE-+\\r?\\n?$",
+                flags: "i",
+                args: ["PEM"]
+            },
         ]
     },
     "PEM to Hex": {
@@ -3896,12 +3896,12 @@ const OperationConfig = {
                 value: MorseCode.WORD_DELIM_OPTIONS
             }
         ],
-        patterns: [ // TODO
-            //{
-            //    match: "^$",
-            //    flags: "",
-            //    args: []
-            //},
+        patterns: [
+            {
+                match: "(?:^[-. \\n]{5,}$|^[_. \\n]{5,}$|^(?:dash|dot| |\\n){5,}$)",
+                flags: "i",
+                args: ["Space", "Line feed"]
+            },
         ]
     },
     "Tar": {
@@ -3922,14 +3922,13 @@ const OperationConfig = {
         description: "Unpacks a tarball and displays it per file.",
         inputType: "byteArray",
         outputType: "html",
-        args: [
-        ],
-        patterns: [ // TODO
-            //{
-            //    match: "^$",
-            //    flags: "",
-            //    args: []
-            //},
+        args: [],
+        patterns: [
+            {
+                match: "^.{257}\\x75\\x73\\x74\\x61\\x72",
+                flags: "",
+                args: []
+            },
         ]
     },
     "Head": {
@@ -4072,12 +4071,12 @@ const OperationConfig = {
                 value: Image.INPUT_FORMAT
             }
         ],
-        patterns: [ // TODO
-            //{
-            //    match: "^$",
-            //    flags: "",
-            //    args: []
-            //},
+        patterns: [
+            {
+                match: "^(?:\\xff\\xd8\\xff|\\x89\\x50\\x4e\\x47|\\x47\\x49\\x46|.{8}\\x57\\x45\\x42\\x50|\\x42\\x4d)",
+                flags: "",
+                args: ["Raw"]
+            },
         ]
     },
     "Remove EXIF": {
@@ -4160,12 +4159,12 @@ const OperationConfig = {
                 value: BCD.FORMAT
             }
         ],
-        patterns: [ // TODO
-            //{
-            //    match: "^$",
-            //    flags: "",
-            //    args: []
-            //},
+        patterns: [
+            {
+                match: "^(?:\\d{4} ){3,}\\d{4}$",
+                flags: "",
+                args: ["8 4 2 1", true, false, "Nibbles"]
+            },
         ]
     },
     "To BCD": {
diff --git a/src/core/operations/PublicKey.js b/src/core/operations/PublicKey.js
index 66b177a5..9dec6f78 100755
--- a/src/core/operations/PublicKey.js
+++ b/src/core/operations/PublicKey.js
@@ -60,7 +60,7 @@ const PublicKey = {
             pkStr = "",
             sig = cert.getSignatureValueHex(),
             sigStr = "",
-            extensions = cert.getInfo().split("X509v3 Extensions:\n")[1].split("signature")[0];
+            extensions = "";
 
         // Public Key fields
         pkFields.push({
@@ -142,6 +142,10 @@ const PublicKey = {
             sigStr = "  Signature:      " + PublicKey._formatByteStr(sig, 16, 18);
         }
 
+        // Extensions
+        try {
+            extensions = cert.getInfo().split("X509v3 Extensions:\n")[1].split("signature")[0];
+        } catch (err) {}
 
         let issuerStr = PublicKey._formatDnStr(issuer, 2),
             nbDate = PublicKey._formatDate(cert.getNotBefore()),