From c4524263bd9c5be90c03afaee4eddc5b099addc1 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Mon, 28 Mar 2022 15:09:28 -0400
Subject: [PATCH] kws fix

---
 KeywordSearch/ivy.xml                                  |  8 ++++----
 .../org/sleuthkit/autopsy/keywordsearch/Server.java    | 10 +++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index 0c6c07f705..bc26285da6 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -22,16 +22,16 @@
         <!-- Autopsy -->
         <dependency conf="autopsy->default" org="org.apache.solr" name="solr-solrj" rev="8.11.1"/>
         <dependency conf="autopsy->default" org="com.optimaize.languagedetector" name="language-detector" rev="0.6"/>       
-        <!-- <dependency conf="autopsy->default" org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.5.0"/> -->
+        <!-- <dependency conf="autopsy->default" org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.5.1"/> -->
         <!-- <dependency conf="autopsy->default" org="org.cleartk" name="cleartk-ml" rev="2.0.0"/> -->
         
         <!-- icu4j for pdfbox bidirectional text support, needs to be defined explicitely (it is optional) -->
         <dependency conf="autopsy->default" org="com.ibm.icu" name="icu4j" rev="70.1"/>
         
         <!-- Jetty -->
-		<!-- <dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="8.1.16.v20140903"/>
-        <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-server" rev="8.1.16.v20140903"/>
-        <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="8.1.16.v20140903"/>
+		<!-- <dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="11.0.8"/>
+        <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-server" rev="11.0.8"/>
+        <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="11.0.8"/>
         <dependency conf="servlet->default" org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016"/> -->
 
         <exclude org="*" ext="*" type="javadoc"/>
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
index bc63f4dddf..c47a7bd23e 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
@@ -2003,7 +2003,15 @@ public class Server {
 
             NamedList<?> cluster = (NamedList) statusResponse.getResponse().get("cluster");
             @SuppressWarnings("unchecked")
-            ArrayList<String> liveNodes = (ArrayList) cluster.get("live_nodes");
+            List<String> liveNodes = (ArrayList) cluster.get("live_nodes");
+            
+            if (liveNodes != null) {
+                liveNodes = liveNodes.stream()
+                        .map(serverStr -> serverStr.endsWith("_solr") 
+                                ? serverStr.substring(0, serverStr.length() - "_solr".length())
+                                : serverStr)
+                        .collect(Collectors.toList());
+            }
             return liveNodes;
         } catch (Exception ex) {
             // intentional "catch all" as Solr is known to throw all kinds of Runtime exceptions