Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into services_monitor

Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java

@@ -210,10 +210,8 @@ public class ExtractedContent implements AutopsyVisitableItem {
 
         @Override
         protected boolean createKeys(List<BlackboardArtifact.ARTIFACT_TYPE> list) {
-            if (skCase == null) {
-                return false;
-            }
 
+            if (skCase != null) {
                 try {
                     List<BlackboardArtifact.ARTIFACT_TYPE> inUse = skCase.getBlackboardArtifactTypesInUse();
                     inUse.removeAll(doNotShow);
@@ -236,7 +234,7 @@ public class ExtractedContent implements AutopsyVisitableItem {
                     }
                 } catch (TskCoreException ex) {
                     Logger.getLogger(TypeFactory.class.getName()).log(Level.SEVERE, "Error getting list of artifacts in use: " + ex.getLocalizedMessage()); //NON-NLS
-                return false;
+                }
             }
             return true;
         }
@@ -446,16 +444,15 @@ public class ExtractedContent implements AutopsyVisitableItem {
 
         @Override
         protected boolean createKeys(List<BlackboardArtifact> list) {
-            if (skCase == null) {
-                return false;
-            }
             
+            if (skCase != null) {
                 try {
                     List<BlackboardArtifact> arts = skCase.getBlackboardArtifacts(type.getTypeID());
                     list.addAll(arts);
                 } catch (TskException ex) {
                     Logger.getLogger(ArtifactFactory.class.getName()).log(Level.SEVERE, "Couldn't get blackboard artifacts from database", ex); //NON-NLS
                 }
+            }
             return true;
         }
 

Core/src/org/sleuthkit/autopsy/datamodel/FileSize.java

@@ -363,11 +363,7 @@ public class FileSize implements AutopsyVisitableItem {
 
             @Override
             protected boolean createKeys(List<AbstractFile> list) {
-                List<AbstractFile> l = runFsQuery();
+                list.addAll(runFsQuery());
-                if (l == null) {
-                    return false;
-                }
-                list.addAll(l);
                 return true;
             }
 
@@ -386,8 +382,7 @@ public class FileSize implements AutopsyVisitableItem {
                         break;
 
                     default:
-                        logger.log(Level.SEVERE, "Unsupported filter type to get files by size: {0}", filter); //NON-NLS
+                        throw new IllegalArgumentException("Unsupported filter type to get files by size: " + filter); //NON-NLS
-                        return null;
                 }
                 // ignore unalloc block files
                 query = query + " AND (type != " + TskData.TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS.getFileType() + ")"; //NON-NLS
@@ -398,19 +393,15 @@ public class FileSize implements AutopsyVisitableItem {
             private List<AbstractFile> runFsQuery() {
                 List<AbstractFile> ret = new ArrayList<>();
 
-                String query = makeQuery(filter);
-                if (query == null) {
-                    return null;
-                }
-
                 try {
+                    String query = makeQuery(filter);
+
                     ret = skCase.findAllFilesWhere(query);
-                } catch (TskCoreException e) {
+                } catch (Exception e) {
-                    logger.log(Level.SEVERE, "Error getting files for the file size view using: " + query, e); //NON-NLS
+                    logger.log(Level.SEVERE, "Error getting files for the file size view: " + e.getMessage()); //NON-NLS
                 }
 
                 return ret;
-
             }
 
             /**

Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java

@@ -237,6 +237,12 @@ public class DataResultFilterNode extends FilterNode {
                 actions.add(AddBlackboardArtifactTagAction.getInstance());
                 actions.addAll(ContextMenuExtensionPoint.getActions());
             }
+            else{
+                // There's no specific file associated with the artifact, but
+                // we can still tag the artifact itself
+                actions.add(null);
+                actions.add(AddBlackboardArtifactTagAction.getInstance());
+            }
             return actions;
         }
 

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties

@@ -66,6 +66,7 @@ ExtractedContentViewer.getSolrContent.knownFileMsg=<p style\=''font-style\:itali
 ExtractedContentViewer.getSolrContent.noTxtYetMsg=<p style\=''font-style\:italic''>{0} does not have text in the index.<br/>It may have no text, not been analyzed yet, or keyword search was not enabled during ingest.</p>
 ExtractedContentViewer.getSolrContent.txtBodyItal=<span style\=''font-style\:italic''>{0}</span>
 HighlightedMatchesSource.getMarkup.noMatchMsg=<html><pre><span style\\\\\='background\\\\\:yellow'>There were no keyword hits on this page. <br />Keyword could have been in file name. <br />Advance to another page for hits or choose Extracted Text to view original text..</span></pre></html>
+HighlightedMatchesSource.getMarkup.queryFailedMsg=<html><pre><span style\\\\\='background\\\\\:yellow'>Failed to retrieve keyword hit results. <br />Confirm that Autopsy can connect to the Solr server. <br /></span></pre></html>
 HighlightedMatchesSource.toString=Search Results
 Installer.reportPortError=Indexing server port {0} is not available.  Check if your security software does not block {1} and consider changing {2} in {3} property file in the application user folder. Then try rebooting your system if another process was causing the conflict.
 Installer.reportStopPortError=Indexing server stop port {0} is not available.  Consider changing {1} in {2} property file in the application user folder.
@@ -212,11 +213,12 @@ Server.openCore.exception.alreadyOpen.msg=Already an open Core\! Explicitely clo
 Server.queryNumIdxFiles.exception.msg=Error querying number of indexed files,
 Server.queryNumIdxChunks.exception.msg=Error querying number of indexed chunks,
 Server.queryNumIdxDocs.exception.msg=Error querying number of indexed documents,
-Server.queryIsIdxd.exception.msg=Error checkign if content is indexed,
+Server.queryIsIdxd.exception.msg=Error checking if content is indexed,
 Server.queryNumFileChunks.exception.msg=Error getting number of file chunks,
 Server.query.exception.msg=Error running query\: {0}
 Server.query2.exception.msg=Error running query\: {0}
 Server.queryTerms.exception.msg=Error running terms query\: {0}
+Server.connect.exception.msg=Failed to connect to Solr server\:
 Server.openCore.exception.msg=Core open requested, but server not yet running
 Server.openCore.exception.cantOpen.msg=Could not open Core
 Server.openCore.exception.cantOpen.msg2=Could not open Core

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedTextMarkup.java

@@ -34,7 +34,6 @@ import org.apache.solr.client.solrj.response.QueryResponse;
 import org.sleuthkit.autopsy.coreutils.Version;
 import org.sleuthkit.autopsy.datamodel.TextMarkupLookup;
 import org.sleuthkit.autopsy.keywordsearch.KeywordQueryFilter.FilterType;
-import org.sleuthkit.datamodel.Content;
 
 /**
  * Highlights hits for a given document. Knows about pages and such for the content viewer. 
@@ -379,12 +378,8 @@ class HighlightedTextMarkup implements TextMarkup, TextMarkupLookup {
 
                 return "<html><pre>" + highlightedContent + "</pre></html>"; //NON-NLS
             }
-        } catch (NoOpenCoreException ex) {
+        } catch (NoOpenCoreException | KeywordSearchModuleException ex) {
-            logger.log(Level.WARNING, "Couldn't query markup for page: " + currentPage, ex); //NON-NLS
+            return NbBundle.getMessage(this.getClass(), "HighlightedMatchesSource.getMarkup.queryFailedMsg");
-            return "";
-        } catch (KeywordSearchModuleException ex) {
-            logger.log(Level.WARNING, "Could not query markup for page: " + currentPage, ex); //NON-NLS
-            return "";
         }
     }
 

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java

@@ -33,14 +33,15 @@ import org.apache.solr.client.solrj.SolrRequest.METHOD;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.EscapeUtil;
+import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import org.sleuthkit.autopsy.coreutils.Version;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 import org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE;
-import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskException;
 
@@ -202,21 +203,32 @@ class LuceneQuery implements KeywordSearchQuery {
         final Server solrServer = KeywordSearch.getServer();
 
         SolrQuery q = createAndConfigureSolrQuery(snippets);
+        QueryResponse response;
+        SolrDocumentList resultList;
+        Map<String, Map<String, List<String>>> highlightResponse;        
+        Set<SolrDocument> uniqueSolrDocumentsWithHits;
+        
+        try {
+            response = solrServer.query(q, METHOD.POST);
+
+            resultList = response.getResults();
+
+            // objectId_chunk -> "text" -> List of previews
+            highlightResponse = response.getHighlighting();
+
+            // get the unique set of files with hits
+            uniqueSolrDocumentsWithHits = filterOneHitPerDocument(resultList);
+        }
+        catch (KeywordSearchModuleException ex) {
+            logger.log(Level.SEVERE, "Error executing Lucene Solr Query: " + keywordString, ex); //NON-NLS            
+            MessageNotifyUtil.Notify.error(NbBundle.getMessage(Server.class, "Server.query.exception.msg", keywordString), ex.getCause().getMessage());
+            return matches;
+        }
 
         // cycle through results in sets of MAX_RESULTS
         for (int start = 0; !allMatchesFetched; start = start + MAX_RESULTS) {
             q.setStart(start);
 
-            try {
-                QueryResponse response = solrServer.query(q, METHOD.POST);
-                SolrDocumentList resultList = response.getResults();
-
-                // objectId_chunk -> "text" -> List of previews
-                Map<String, Map<String, List<String>>> highlightResponse = response.getHighlighting();
-
-                // get the unique set of files with hits
-                Set<SolrDocument> uniqueSolrDocumentsWithHits = filterOneHitPerDocument(resultList);
-
             allMatchesFetched = start + MAX_RESULTS >= resultList.getNumFound();
 
             SleuthkitCase sleuthkitCase;
@@ -236,14 +248,6 @@ class LuceneQuery implements KeywordSearchQuery {
                 }
                 matches.add(contentHit);
             }
-
-            } catch (NoOpenCoreException ex) {
-                logger.log(Level.WARNING, "Error executing Lucene Solr Query: " + keywordString, ex); //NON-NLS
-                throw ex;
-            } catch (KeywordSearchModuleException ex) {
-                logger.log(Level.WARNING, "Error executing Lucene Solr Query: " + keywordString, ex); //NON-NLS
-            }
-
         }
         return matches;
     }

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java

@@ -33,7 +33,6 @@ import java.net.ConnectException;
 import java.net.ServerSocket;
 import java.net.SocketException;
 import java.nio.charset.Charset;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -65,6 +64,7 @@ import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrException;
 import org.sleuthkit.autopsy.casemodule.Case.CaseType;
 import org.sleuthkit.autopsy.core.UserPreferences;
+import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 
 /**
  * Handles for keeping track of a Solr server and its cores
@@ -665,6 +665,23 @@ public class Server {
      * @return
      */
     private synchronized Core openCore(Case theCase) throws KeywordSearchModuleException {
+        try {
+            if (theCase.getCaseType() == CaseType.SINGLE_USER_CASE) {
+                currentSolrServer = this.localSolrServer;
+            }
+            else {
+                String host = UserPreferences.getIndexingServerHost();
+                String port = UserPreferences.getIndexingServerPort();
+
+                currentSolrServer = new HttpSolrServer("http://" + host + ":" + port + "/solr"); //NON-NLS
+            }
+            connectToSolrServer(currentSolrServer);
+        }
+        catch (SolrServerException | IOException ex) {
+            MessageNotifyUtil.Notify.error(NbBundle.getMessage(Server.class, "Server.connect.exception.msg"), ex.getCause().getMessage());
+            throw new KeywordSearchModuleException(NbBundle.getMessage(Server.class, "Server.connect.exception.msg"));
+        }
+
         String dataDir = getIndexDirPath(theCase);
         String coreName = theCase.getTextIndexName();
         return this.openCore(coreName.isEmpty() ? DEFAULT_CORE_NAME : coreName, new File(dataDir), theCase.getCaseType());
@@ -696,7 +713,7 @@ public class Server {
      *
      * @return int representing number of indexed files
      * @throws KeywordSearchModuleException
-     * @throws NoOpenCoreExceptionn
+     * @throws NoOpenCoreException
      */
     public int queryNumIndexedFiles() throws KeywordSearchModuleException, NoOpenCoreException {
         if (currentCore == null) {
@@ -940,6 +957,7 @@ public class Server {
      * @return new core
      */
     private Core openCore(String coreName, File dataDir, CaseType caseType) throws KeywordSearchModuleException {
+        
         try {
             if (!dataDir.exists()) {
                 dataDir.mkdirs();
@@ -952,14 +970,6 @@ public class Server {
                         NbBundle.getMessage(this.getClass(), "Server.openCore.exception.msg"));
             }
 
-            if (caseType == CaseType.SINGLE_USER_CASE) {
-                currentSolrServer = this.localSolrServer;
-                //createCore.setInstanceDir(instanceDir);
-            }
-            else {
-                currentSolrServer = connectToRemoteSolrServer();
-            }
-            
             if (!isCoreLoaded(coreName)) {
                 CoreAdminRequest.Create createCore = new CoreAdminRequest.Create();
                 createCore.setDataDir(dataDir.getAbsolutePath());
@@ -984,11 +994,14 @@ public class Server {
         }
     }
 
-    HttpSolrServer connectToRemoteSolrServer() {
+    /**
-        String host = UserPreferences.getIndexingServerHost();
+     * Attempts to connect to the given Solr server.
-        String port = UserPreferences.getIndexingServerPort();
+     * @param solrServer
-        
+     * @throws SolrServerException
-        return new HttpSolrServer("http://" + host + ":" + port + "/solr");
+     * @throws IOException 
+     */
+    void connectToSolrServer(HttpSolrServer solrServer) throws SolrServerException, IOException {
+        CoreAdminRequest.getStatus(null, solrServer);
     }
 
     /**

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java

@@ -22,15 +22,14 @@ import java.io.IOException;
 import java.util.HashMap;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.HttpSolrServer;
-import org.apache.solr.client.solrj.request.CoreAdminRequest;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchService;
 import org.apache.solr.common.util.ContentStreamBase.StringStream;
-import org.openide.util.Exceptions;
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.casemodule.Case;
+import org.sleuthkit.autopsy.core.UserPreferences;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
@@ -152,8 +151,10 @@ public class SolrSearchService implements KeywordSearchService {
     @Override
     public boolean canConnectToRemoteSolrServer() {
         try {
-            HttpSolrServer solrServer = KeywordSearch.getServer().connectToRemoteSolrServer();
+            String host = UserPreferences.getIndexingServerHost();
-            CoreAdminRequest.getStatus(null, solrServer);
+            String port = UserPreferences.getIndexingServerPort();
+            HttpSolrServer solrServer = new HttpSolrServer("http://" + host + ":" + port + "/solr"); //NON-NLS;
+            KeywordSearch.getServer().connectToSolrServer(solrServer);
         }
         catch (SolrServerException | IOException ex) {
             return false;