From 928bbd40ed362743b32c8bc8e7e9e08ebdd5e113 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Fri, 1 May 2020 08:45:09 -0400
Subject: [PATCH] requires comma for comment

---
 ...AddHashValuesToDatabaseProgressDialog.java | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/AddHashValuesToDatabaseProgressDialog.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/AddHashValuesToDatabaseProgressDialog.java
index 99eecf50d2..73d1a02314 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/AddHashValuesToDatabaseProgressDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/AddHashValuesToDatabaseProgressDialog.java
@@ -30,6 +30,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.SwingWorker;
+import org.apache.commons.lang3.StringUtils;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDb;
 import org.sleuthkit.datamodel.HashEntry;
@@ -46,7 +47,14 @@ public class AddHashValuesToDatabaseProgressDialog extends javax.swing.JDialog {
     private final HashDb hashDb;
     private final List<HashEntry> hashes;
     private final List<String> invalidHashes;
-    private final Pattern md5Pattern;
+    
+    // Matches hash with optional comma separated comment.
+    private static final Pattern HASH_LINE_PATTERN = Pattern.compile("^([a-fA-F0-9]{32})(,(.*))?$");
+    // The regex group for the hash.
+    private static final int HASH_GROUP = 1;
+    // The regex group for the comment.
+    private static final int COMMENT_GROUP = 3;
+    
     private String errorTitle;
     private String errorMessage;
     private final String text;
@@ -64,7 +72,6 @@ public class AddHashValuesToDatabaseProgressDialog extends javax.swing.JDialog {
         display(parent);
         this.hashes = new ArrayList<>();
         this.invalidHashes = new ArrayList<>();
-        this.md5Pattern = Pattern.compile("^([a-fA-F0-9]{32})"); // NON-NLS
         this.parentRef = parent;
         this.hashDb = hashDb;
         this.text = text;
@@ -161,17 +168,15 @@ public class AddHashValuesToDatabaseProgressDialog extends javax.swing.JDialog {
         // These entries may be of <MD5> or <MD5, comment> format
         for (String hashEntry : linesInTextArea) {
             hashEntry = hashEntry.trim();
-            Matcher m = md5Pattern.matcher(hashEntry);
+            Matcher m = HASH_LINE_PATTERN.matcher(hashEntry);
             if (m.find()) {               
-                // Is there any text left on this line? If so, treat it as a comment.
-                String comment = hashEntry.substring(m.end()).trim();
-                if (comment.length() > 0) {
-                    comment = (comment.charAt(0) == ',') ? comment.substring(1) : comment;
-                    hashes.add(new HashEntry(null, m.group(0), null, null, comment));
-                } else {
-                    // more information can be added to the HashEntry - sha-1, sha-512, comment
-                    hashes.add(new HashEntry(null, m.group(0), null, null, null));
-                }
+                String hash = m.group(HASH_GROUP);
+                
+                // if there was a match and the match is not empty, assign to comment
+                String comment = StringUtils.isNotBlank(m.group(COMMENT_GROUP)) ? 
+                    m.group(COMMENT_GROUP).trim() : null;
+                
+                hashes.add(new HashEntry(null, hash, null, null, comment));
             } else {
                 if (!hashEntry.isEmpty()) {
                     invalidHashes.add(hashEntry);