From 020011bff121ffb2633f91da5c45cb52ead67af5 Mon Sep 17 00:00:00 2001 From: esaunders Date: Wed, 14 Dec 2016 13:58:18 -0500 Subject: [PATCH] Change the ordering of the regex for the last element of the IP address regex because we were only getting IP address hits containing a single digit as the last element, e.g. we would get a hit for 152.163.199.5 instead of 152.163.199.56. --- .../org/sleuthkit/autopsy/keywordsearch/KeywordSearchList.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchList.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchList.java index 577392a3a5..59b283da33 100755 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchList.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchList.java @@ -40,7 +40,7 @@ abstract class KeywordSearchList { protected static final Logger LOGGER = Logger.getLogger(KeywordSearchList.class.getName()); private static final String PHONE_NUMBER_REGEX = "[(]{0,1}\\d\\d\\d[)]{0,1}[\\.-]\\d\\d\\d[\\.-]\\d\\d\\d\\d"; //NON-NLS - private static final String IP_ADDRESS_REGEX = "(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])"; //NON-NLS + private static final String IP_ADDRESS_REGEX = "(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]|[0-9])"; //NON-NLS private static final String EMAIL_ADDRESS_REGEX = "(?=.{8})[a-z0-9%+_-]+(?:\\.[a-z0-9%+_-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z]{2,4}(?