From cb1736f33398ae63741d28dcd308c264d462ff11 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Tue, 1 Dec 2020 15:44:11 -0500
Subject: [PATCH] fix for more domains

---
 .../sleuthkit/autopsy/coreutils/NetworkUtils.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/NetworkUtils.java b/Core/src/org/sleuthkit/autopsy/coreutils/NetworkUtils.java
index 31497ab6fd..8078a8c6a3 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/NetworkUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/NetworkUtils.java
@@ -23,6 +23,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.logging.Level;
+import org.apache.commons.lang.StringUtils;
 
 public class NetworkUtils {
 
@@ -104,19 +105,21 @@ public class NetworkUtils {
         if (urlString == null) {
             return "";
         }
-        String result = "";
+        String urlHost = null;
 
         try {
             URL url = new URL(urlString);
-            result = url.getHost();
+            urlHost = url.getHost();
         } catch (MalformedURLException ex) {
             //do not log if not a valid URL - we will try to extract it ourselves
         }
 
-        //was not a valid URL, try a less picky method
-        if (result == null || result.trim().isEmpty()) {
-            return getBaseDomain(urlString);
-        }
+        // if there is a valid url host, get base domain from that host
+        // otherwise use urlString and parse the domain
+        String result = (StringUtils.isNotBlank(urlHost))
+                ? getBaseDomain(urlHost)
+                : getBaseDomain(urlString);
+
         return result;
     }