mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-14 17:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/collaborative' into new-tag-events-collab

Browse Source 
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
This commit is contained in:
jmillman 2015-07-01 13:12:21 -04:00
commit 1e13d5a039
17 changed files with 92 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
View File

@ -222,14 +222,14 @@ class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDe
*/ */
private void startDataSourceProcessing(WizardDescriptor settings) { private void startDataSourceProcessing(WizardDescriptor settings) {
final UUID dataSourceId = UUID.randomUUID();
// Add a cleanup task to interrupt the background process if the // Add a cleanup task to interrupt the background process if the
// wizard exits while the background process is running. // wizard exits while the background process is running.
cleanupTask = addImageAction.new CleanupTask() { cleanupTask = addImageAction.new CleanupTask() {
@Override @Override
void cleanup() throws Exception { void cleanup() throws Exception {
cancelDataSourceProcessing(); cancelDataSourceProcessing(dataSourceId);
} }
}; };
@ -238,7 +238,6 @@ class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDe
// get the selected DSProcessor // get the selected DSProcessor
dsProcessor = dataSourcePanel.getComponent().getCurrentDSProcessor(); dsProcessor = dataSourcePanel.getComponent().getCurrentDSProcessor();
final UUID dataSourceId = UUID.randomUUID();
Case.getCurrentCase().notifyAddingNewDataSource(dataSourceId); Case.getCurrentCase().notifyAddingNewDataSource(dataSourceId);
DataSourceProcessorCallback cbObj = new DataSourceProcessorCallback () { DataSourceProcessorCallback cbObj = new DataSourceProcessorCallback () {
@Override @Override
@ -258,7 +257,8 @@ class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDe
/* /*
* Cancels the data source processing - in case the users presses 'Cancel' * Cancels the data source processing - in case the users presses 'Cancel'
*/ */
private void cancelDataSourceProcessing() { private void cancelDataSourceProcessing(UUID dataSourceId) {
Case.getCurrentCase().notifyFailedAddingNewDataSource(dataSourceId);
dsProcessor.cancel(); dsProcessor.cancel();
} }

4
Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
View File

@ -242,11 +242,11 @@ LocalFilesPanel.errorLabel.text=Error Label
NewCaseVisualPanel1.errorLabel.text=Error Label NewCaseVisualPanel1.errorLabel.text=Error Label
CollaborationMonitor.addingDataSourceStatus.msg={0} adding data source CollaborationMonitor.addingDataSourceStatus.msg={0} adding data source
CollaborationMonitor.analyzingDataSourceStatus.msg={0} analyzing {1} CollaborationMonitor.analyzingDataSourceStatus.msg={0} analyzing {1}
CollaborationMonitor.failedService.notify.title={0} Collaboration Service Failed CollaborationMonitor.failedService.notify.title=Collaboration Service Failed
CollaborationMonitor.failedDbService.notify.msg=Lost connection to database server CollaborationMonitor.failedDbService.notify.msg=Lost connection to database server
CollaborationMonitor.failedSolrService.notify.msg=Lost connection to keyword search server CollaborationMonitor.failedSolrService.notify.msg=Lost connection to keyword search server
CollaborationMonitor.failedMessageService.notify.msg=Lost connection to messaging server CollaborationMonitor.failedMessageService.notify.msg=Lost connection to messaging server
CollaborationMonitor.restoredService.notify.title={0} Collaboration Service Restored CollaborationMonitor.restoredService.notify.title=Collaboration Service Restored
CollaborationMonitor.restoredDbService.notify.msg=Connection to database server restored CollaborationMonitor.restoredDbService.notify.msg=Connection to database server restored
CollaborationMonitor.restoredSolrService.notify.msg=Connection to keyword search server restored CollaborationMonitor.restoredSolrService.notify.msg=Connection to keyword search server restored
CollaborationMonitor.restoredMessageService.notify.msg=Connection to messaging server restored CollaborationMonitor.restoredMessageService.notify.msg=Connection to messaging server restored

1
Core/src/org/sleuthkit/autopsy/casemodule/Case.java
View File

@ -495,7 +495,6 @@ public class Case {
XMLCaseManagement xmlcm = new XMLCaseManagement(); XMLCaseManagement xmlcm = new XMLCaseManagement();
xmlcm.open(configFilePath); // open and load the config file to the document handler in the XML class xmlcm.open(configFilePath); // open and load the config file to the document handler in the XML class
xmlcm.writeFile(); // write any changes to the config file
String caseName = xmlcm.getCaseName(); String caseName = xmlcm.getCaseName();
String caseNumber = xmlcm.getCaseNumber(); String caseNumber = xmlcm.getCaseNumber();

58
Core/src/org/sleuthkit/autopsy/casemodule/CollaborationMonitor.java
View File

@ -24,11 +24,9 @@ import java.beans.PropertyChangeListener;
import java.io.Serializable; import java.io.Serializable;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.text.SimpleDateFormat;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
@ -57,6 +55,7 @@ import org.sleuthkit.autopsy.events.MessageServiceConnectionInfo;
import org.sleuthkit.autopsy.ingest.IngestManager; import org.sleuthkit.autopsy.ingest.IngestManager;
import org.sleuthkit.autopsy.ingest.events.DataSourceAnalysisCompletedEvent; import org.sleuthkit.autopsy.ingest.events.DataSourceAnalysisCompletedEvent;
import org.sleuthkit.autopsy.ingest.events.DataSourceAnalysisStartedEvent; import org.sleuthkit.autopsy.ingest.events.DataSourceAnalysisStartedEvent;
import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchService;
import org.sleuthkit.datamodel.CaseDbConnectionInfo; import org.sleuthkit.datamodel.CaseDbConnectionInfo;
/** /**
@ -69,7 +68,7 @@ final class CollaborationMonitor {
private static final String EVENT_CHANNEL_NAME = "%s-Collaboration-Monitor-Events"; private static final String EVENT_CHANNEL_NAME = "%s-Collaboration-Monitor-Events";
private static final String COLLABORATION_MONITOR_EVENT = "COLLABORATION_MONITOR_EVENT"; private static final String COLLABORATION_MONITOR_EVENT = "COLLABORATION_MONITOR_EVENT";
private static final Set<String> CASE_EVENTS_OF_INTEREST = new HashSet<>(Arrays.asList(new String[]{Case.Events.ADDING_DATA_SOURCE.toString(), Case.Events.DATA_SOURCE_ADDED.toString()})); private static final Set<String> CASE_EVENTS_OF_INTEREST = new HashSet<>(Arrays.asList(new String[]{Case.Events.ADDING_DATA_SOURCE.toString(), Case.Events.DATA_SOURCE_ADDED.toString(), Case.Events.ADDING_DATA_SOURCE_FAILED.toString()}));
private static final int NUMBER_OF_PERIODIC_TASK_THREADS = 3; private static final int NUMBER_OF_PERIODIC_TASK_THREADS = 3;
private static final String PERIODIC_TASK_THREAD_NAME = "collab-monitor-periodic-tasks-%d"; private static final String PERIODIC_TASK_THREAD_NAME = "collab-monitor-periodic-tasks-%d";
private static final long HEARTBEAT_INTERVAL_MINUTES = 1; private static final long HEARTBEAT_INTERVAL_MINUTES = 1;
@ -77,7 +76,6 @@ final class CollaborationMonitor {
private static final long STALE_TASKS_DETECTION_INTERVAL_MINUTES = 2; private static final long STALE_TASKS_DETECTION_INTERVAL_MINUTES = 2;
private static final long CRASH_DETECTION_INTERVAL_MINUTES = 2; private static final long CRASH_DETECTION_INTERVAL_MINUTES = 2;
private static final long EXECUTOR_TERMINATION_WAIT_SECS = 30; private static final long EXECUTOR_TERMINATION_WAIT_SECS = 30;
private static final SimpleDateFormat SERVICE_MSG_DATE_FORMAT = new SimpleDateFormat("MM/dd HH:mm:ss z");
private static final Logger logger = Logger.getLogger(CollaborationMonitor.class.getName()); private static final Logger logger = Logger.getLogger(CollaborationMonitor.class.getName());
private final String hostName; private final String hostName;
private final LocalTasksManager localTasksManager; private final LocalTasksManager localTasksManager;
@ -525,7 +523,7 @@ final class CollaborationMonitor {
private final static class CrashDetectionTask implements Runnable { private final static class CrashDetectionTask implements Runnable {
private static boolean dbServerIsRunning = true; private static boolean dbServerIsRunning = true;
// private static boolean solrServerIsRunning = true; private static boolean solrServerIsRunning = true;
private static boolean messageServerIsRunning = true; private static boolean messageServerIsRunning = true;
private static final Object lock = new Object(); private static final Object lock = new Object();
@ -540,41 +538,33 @@ final class CollaborationMonitor {
if (!dbServerIsRunning) { if (!dbServerIsRunning) {
dbServerIsRunning = true; dbServerIsRunning = true;
logger.log(Level.INFO, "Connection to PostgreSQL server restored"); //NON-NLS logger.log(Level.INFO, "Connection to PostgreSQL server restored"); //NON-NLS
MessageNotifyUtil.Notify.info(NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.restoredService.notify.title", SERVICE_MSG_DATE_FORMAT.format(new Date())), NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.restoredDbService.notify.msg")); MessageNotifyUtil.Notify.info(NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.restoredService.notify.title"), NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.restoredDbService.notify.msg"));
} }
} else { } else {
if (dbServerIsRunning) { if (dbServerIsRunning) {
dbServerIsRunning = false; dbServerIsRunning = false;
logger.log(Level.SEVERE, "Failed to connect to PostgreSQL server"); //NON-NLS logger.log(Level.SEVERE, "Failed to connect to PostgreSQL server"); //NON-NLS
MessageNotifyUtil.Notify.error(NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.failedService.notify.title", SERVICE_MSG_DATE_FORMAT.format(new Date())), NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.failedDbService.notify.msg")); MessageNotifyUtil.Notify.error(NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.failedService.notify.title"), NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.failedDbService.notify.msg"));
} }
} }
/** KeywordSearchService kwsService = Case.getCurrentCase().getServices().getKeywordSearchService();
* TODO: Figure out what is wrong with this code. The call to
* construct the HttpSolrServer object never returns. Perhaps if (kwsService.canConnectToRemoteSolrServer()) {
* this is the result of a dependency of the solr-solrj-4.91.jar if (!solrServerIsRunning) {
* that is not satisfied. Removing the jar from wrapped jars for solrServerIsRunning = true;
* now. logger.log(Level.INFO, "Connection to Solr server restored"); //NON-NLS
*/ MessageNotifyUtil.Notify.info(NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.restoredService.notify.title"), NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.restoredSolrService.notify.msg"));
// try { }
// String host = UserPreferences.getIndexingServerHost(); }
// String port = UserPreferences.getIndexingServerPort(); else {
// HttpSolrServer solr = new HttpSolrServer("http://" + host + ":" + port + "/solr"); //NON-NLS if (solrServerIsRunning) {
// CoreAdminRequest.getStatus(Case.getCurrentCase().getTextIndexName(), solr); solrServerIsRunning = false;
// if (!solrServerIsRunning) { logger.log(Level.SEVERE, "Failed to connect to Solr server"); //NON-NLS
// solrServerIsRunning = true; MessageNotifyUtil.Notify.error(NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.failedService.notify.title"), NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.failedSolrService.notify.msg"));
// logger.log(Level.INFO, "Connection to Solr server restored"); //NON-NLS }
// MessageNotifyUtil.Notify.info(NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.restoredService.notify.title", SERVICE_MSG_DATE_FORMAT.format(new Date())), NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.restoredSolrService.notify.msg")); }
// }
// } catch (SolrServerException | IOException ex) {
// if (solrServerIsRunning) {
// solrServerIsRunning = false;
// logger.log(Level.SEVERE, "Failed to connect to Solr server", ex); //NON-NLS
// MessageNotifyUtil.Notify.error(NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.failedService.notify.title", SERVICE_MSG_DATE_FORMAT.format(new Date())), NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.failedSolrService.notify.msg"));
// }
// }
//
MessageServiceConnectionInfo msgInfo = UserPreferences.getMessageServiceConnectionInfo(); MessageServiceConnectionInfo msgInfo = UserPreferences.getMessageServiceConnectionInfo();
try { try {
ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(msgInfo.getUserName(), msgInfo.getPassword(), msgInfo.getURI()); ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(msgInfo.getUserName(), msgInfo.getPassword(), msgInfo.getURI());
@ -584,13 +574,13 @@ final class CollaborationMonitor {
if (!messageServerIsRunning) { if (!messageServerIsRunning) {
messageServerIsRunning = true; messageServerIsRunning = true;
logger.log(Level.INFO, "Connection to ActiveMQ server restored"); //NON-NLS logger.log(Level.INFO, "Connection to ActiveMQ server restored"); //NON-NLS
MessageNotifyUtil.Notify.info(NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.restoredService.notify.title", SERVICE_MSG_DATE_FORMAT.format(new Date())), NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.restoredMessageService.notify.msg")); MessageNotifyUtil.Notify.info(NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.restoredService.notify.title"), NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.restoredMessageService.notify.msg"));
} }
} catch (URISyntaxException | JMSException ex) { } catch (URISyntaxException | JMSException ex) {
if (messageServerIsRunning) { if (messageServerIsRunning) {
messageServerIsRunning = false; messageServerIsRunning = false;
logger.log(Level.SEVERE, "Failed to connect to ActiveMQ server", ex); //NON-NLS logger.log(Level.SEVERE, "Failed to connect to ActiveMQ server", ex); //NON-NLS
MessageNotifyUtil.Notify.error(NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.failedService.notify.title", SERVICE_MSG_DATE_FORMAT.format(new Date())), NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.failedMessageService.notify.msg")); MessageNotifyUtil.Notify.error(NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.failedService.notify.title"), NbBundle.getMessage(CollaborationMonitor.class, "CollaborationMonitor.failedMessageService.notify.msg"));
} }
} }
} }

1
Core/src/org/sleuthkit/autopsy/core/Installer.java
View File

@ -65,6 +65,7 @@ public class Installer extends ModuleInstall {
//We should update this if we officially switch to a new version of CRT/compiler //We should update this if we officially switch to a new version of CRT/compiler
System.loadLibrary("msvcr100"); //NON-NLS System.loadLibrary("msvcr100"); //NON-NLS
System.loadLibrary("msvcp100"); //NON-NLS System.loadLibrary("msvcp100"); //NON-NLS
System.loadLibrary("msvcr120"); //NON-NLS
logger.log(Level.INFO, "MSVCR100 and MSVCP100 libraries loaded"); //NON-NLS logger.log(Level.INFO, "MSVCR100 and MSVCP100 libraries loaded"); //NON-NLS
} catch (UnsatisfiedLinkError e) { } catch (UnsatisfiedLinkError e) {
logger.log(Level.SEVERE, "Error loading MSVCR100 and MSVCP100 libraries, ", e); //NON-NLS logger.log(Level.SEVERE, "Error loading MSVCR100 and MSVCP100 libraries, ", e); //NON-NLS

6
Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
View File

@ -115,7 +115,7 @@ public final class UserPreferences {
} }
return new CaseDbConnectionInfo( return new CaseDbConnectionInfo(
preferences.get(EXTERNAL_DATABASE_HOSTNAME_OR_IP, ""), preferences.get(EXTERNAL_DATABASE_HOSTNAME_OR_IP, ""),
preferences.get(EXTERNAL_DATABASE_PORTNUMBER, ""), preferences.get(EXTERNAL_DATABASE_PORTNUMBER, "5432"),
preferences.get(EXTERNAL_DATABASE_USER, ""), preferences.get(EXTERNAL_DATABASE_USER, ""),
preferences.get(EXTERNAL_DATABASE_PASSWORD, ""), preferences.get(EXTERNAL_DATABASE_PASSWORD, ""),
dbType); dbType);
@ -138,7 +138,7 @@ public final class UserPreferences {
} }
public static String getIndexingServerPort() { public static String getIndexingServerPort() {
return preferences.get(INDEXING_SERVER_PORT, ""); return preferences.get(INDEXING_SERVER_PORT, "8983");
} }
public static void setIndexingServerPort(int port) { public static void setIndexingServerPort(int port) {
@ -166,7 +166,7 @@ public final class UserPreferences {
return new MessageServiceConnectionInfo(preferences.get(MESSAGE_SERVICE_USER, ""), return new MessageServiceConnectionInfo(preferences.get(MESSAGE_SERVICE_USER, ""),
preferences.get(MESSAGE_SERVICE_PASSWORD, ""), preferences.get(MESSAGE_SERVICE_PASSWORD, ""),
preferences.get(MESSAGE_SERVICE_HOST, ""), preferences.get(MESSAGE_SERVICE_HOST, ""),
preferences.get(MESSAGE_SERVICE_PORT, "")); preferences.get(MESSAGE_SERVICE_PORT, "61616"));
} }
/** /**

2
Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
View File

@ -175,8 +175,6 @@ MultiUserSettingsPanel.msgPasswordField.toolTipText=Password
MultiUserSettingsPanel.msgPasswordField.text= MultiUserSettingsPanel.msgPasswordField.text=
MultiUserSettingsPanel.msgPortTextField.toolTipText=Hostname or IP Address MultiUserSettingsPanel.msgPortTextField.toolTipText=Hostname or IP Address
MultiUserSettingsPanel.msgPortTextField.text= MultiUserSettingsPanel.msgPortTextField.text=
MultiUserSettingsPanel.tbIndexingServerHost.text=localhost
MultiUserSettingsPanel.tbIndexingServerPort.text=23232
MultiUserSettingsPanel.tbIndexingServerHost.toolTipText=Hostname or IP Address MultiUserSettingsPanel.tbIndexingServerHost.toolTipText=Hostname or IP Address
MultiUserSettingsPanel.tbIndexingServerPort.toolTipText=Port Number MultiUserSettingsPanel.tbIndexingServerPort.toolTipText=Port Number
AutopsyOptionsPanel.jCheckBoxEnableProcTimeout.text= AutopsyOptionsPanel.jCheckBoxEnableProcTimeout.text=

6
Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.form
View File

@ -238,9 +238,6 @@
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="12" style="0"/> <Font name="Tahoma" size="12" style="0"/>
</Property> </Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.tbIndexingServerHost.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.tbIndexingServerHost.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.tbIndexingServerHost.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property> </Property>
@ -254,9 +251,6 @@
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="12" style="0"/> <Font name="Tahoma" size="12" style="0"/>
</Property> </Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.tbIndexingServerPort.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.tbIndexingServerPort.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.tbIndexingServerPort.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property> </Property>

2
Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java
View File

@ -193,7 +193,6 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
org.openide.awt.Mnemonics.setLocalizedText(lbSolrSettings, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbSolrSettings.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(lbSolrSettings, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbSolrSettings.text")); // NOI18N
tbIndexingServerHost.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N tbIndexingServerHost.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
tbIndexingServerHost.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbIndexingServerHost.text")); // NOI18N
tbIndexingServerHost.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbIndexingServerHost.toolTipText")); // NOI18N tbIndexingServerHost.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbIndexingServerHost.toolTipText")); // NOI18N
tbIndexingServerHost.addActionListener(new java.awt.event.ActionListener() { tbIndexingServerHost.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
@ -202,7 +201,6 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
}); });
tbIndexingServerPort.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N tbIndexingServerPort.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
tbIndexingServerPort.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbIndexingServerPort.text")); // NOI18N
tbIndexingServerPort.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbIndexingServerPort.toolTipText")); // NOI18N tbIndexingServerPort.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbIndexingServerPort.toolTipText")); // NOI18N
tbIndexingServerPort.addActionListener(new java.awt.event.ActionListener() { tbIndexingServerPort.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {

44
Core/src/org/sleuthkit/autopsy/coreutils/MessageNotifyUtil.java
View File

@ -1,7 +1,7 @@
/* /*
* Autopsy Forensic Browser * Autopsy Forensic Browser
* *
* Copyright 2013 Basis Technology Corp. * Copyright 2013-2015 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org * Contact: carrier <at> sleuthkit <dot> org
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -20,8 +20,10 @@ package org.sleuthkit.autopsy.coreutils;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import javax.swing.Icon; import javax.swing.Icon;
@ -52,8 +54,8 @@ public class MessageNotifyUtil {
INFO(NotifyDescriptor.INFORMATION_MESSAGE, "info-icon-16.png"), //NON-NLS INFO(NotifyDescriptor.INFORMATION_MESSAGE, "info-icon-16.png"), //NON-NLS
ERROR(NotifyDescriptor.ERROR_MESSAGE, "error-icon-16.png"), //NON-NLS ERROR(NotifyDescriptor.ERROR_MESSAGE, "error-icon-16.png"), //NON-NLS
WARNING(NotifyDescriptor.WARNING_MESSAGE, "warning-icon-16.png"); //NON-NLS WARNING(NotifyDescriptor.WARNING_MESSAGE, "warning-icon-16.png"); //NON-NLS
private int notifyDescriptorType; private final int notifyDescriptorType;
private Icon icon; private final Icon icon;
private MessageType(int notifyDescriptorType, String resourceName) { private MessageType(int notifyDescriptorType, String resourceName) {
this.notifyDescriptorType = notifyDescriptorType; this.notifyDescriptorType = notifyDescriptorType;
@ -121,7 +123,7 @@ public class MessageNotifyUtil {
/** /**
* Show an error dialog * Show an error dialog
* *
* @param message message to shpw * @param message message to show
*/ */
public static void error(String message) { public static void error(String message) {
show(message, MessageType.ERROR); show(message, MessageType.ERROR);
@ -142,20 +144,21 @@ public class MessageNotifyUtil {
*/ */
public static class Notify { public static class Notify {
private static final SimpleDateFormat TIME_STAMP_FORMAT = new SimpleDateFormat("MM/dd/yy HH:mm:ss z");
//notifications to keep track of and to reset when case is closed //notifications to keep track of and to reset when case is closed
private static final List<Notification> notifications = Collections.synchronizedList(new ArrayList<Notification>()); private static final List<Notification> notifications = Collections.synchronizedList(new ArrayList<Notification>());
private Notify() { private Notify() {
} }
/** /**
* Clear pending notifications * Clear pending notifications Should really only be used by Case
* Should really only be used by Case
*/ */
public static void clear() { public static void clear() {
for (Notification n : notifications) { notifications.stream().forEach((n) -> {
n.clear(); n.clear();
} });
notifications.clear(); notifications.clear();
} }
@ -163,8 +166,8 @@ public class MessageNotifyUtil {
* Show message with the specified type and action listener * Show message with the specified type and action listener
*/ */
public static void show(String title, String message, MessageType type, ActionListener actionListener) { public static void show(String title, String message, MessageType type, ActionListener actionListener) {
Notification newNotification = Notification newNotification
NotificationDisplayer.getDefault().notify(title, type.getIcon(), message, actionListener); = NotificationDisplayer.getDefault().notify(addTimeStampToTitle(title), type.getIcon(), message, actionListener);
notifications.add(newNotification); notifications.add(newNotification);
} }
@ -178,11 +181,8 @@ public class MessageNotifyUtil {
* @param type type of the message * @param type type of the message
*/ */
public static void show(String title, final String message, final MessageType type) { public static void show(String title, final String message, final MessageType type) {
ActionListener actionListener = new ActionListener() { ActionListener actionListener = (ActionEvent e) -> {
@Override MessageNotifyUtil.Message.show(message, type);
public void actionPerformed(ActionEvent e) {
MessageNotifyUtil.Message.show(message, type);
}
}; };
show(title, message, type, actionListener); show(title, message, type, actionListener);
@ -217,5 +217,17 @@ public class MessageNotifyUtil {
public static void warn(String title, String message) { public static void warn(String title, String message) {
show(title, message, MessageType.WARNING); show(title, message, MessageType.WARNING);
} }
/**
* Adds a time stamp prefix to the title of notifications so that they
* will be in order (they are sorted alphabetically) in the
* notifications area.
*
* @param title A notification title without a time stamp prefix.
* @return The notification title with a time stamp prefix.
*/
private static String addTimeStampToTitle(String title) {
return TIME_STAMP_FORMAT.format(new Date()) + " " + title;
}
} }
} }

4
Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestJob.java
View File

@ -343,6 +343,7 @@ final class DataSourceIngestJob {
* @return A collection of ingest module startup errors, empty on success. * @return A collection of ingest module startup errors, empty on success.
*/ */
List<IngestModuleError> start() { List<IngestModuleError> start() {
IngestManager.getInstance().fireDataSourceAnalysisStarted(parentJob.getId(), id, dataSource);
List<IngestModuleError> errors = startUpIngestPipelines(); List<IngestModuleError> errors = startUpIngestPipelines();
if (errors.isEmpty()) { if (errors.isEmpty()) {
if (this.hasFirstStageDataSourceIngestPipeline() || this.hasFileIngestPipeline()) { if (this.hasFirstStageDataSourceIngestPipeline() || this.hasFileIngestPipeline()) {
@ -936,7 +937,8 @@ final class DataSourceIngestJob {
} }
} }
} }
IngestManager.getInstance().fireDataSourceAnalysisCancelled(parentJob.getId(), id, dataSource);
this.cancelled = true; this.cancelled = true;
/** /**

8
Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
View File

@ -116,12 +116,7 @@ public final class IngestJob {
* startup is going to fail, it will likely fail for the first child * startup is going to fail, it will likely fail for the first child
* data source ingest job. * data source ingest job.
*/ */
if (errors.isEmpty()) { if(! errors.isEmpty()) {
IngestManager ingestManager = IngestManager.getInstance();
this.dataSourceJobs.values().stream().forEach((dataSourceJob) -> {
ingestManager.fireDataSourceAnalysisStarted(id, dataSourceJob.getId(), dataSourceJob.getDataSource());
});
} else {
this.dataSourceJobs.values().stream().forEach((dataSourceJob) -> { this.dataSourceJobs.values().stream().forEach((dataSourceJob) -> {
dataSourceJob.cancel(); dataSourceJob.cancel();
}); });
@ -172,7 +167,6 @@ public final class IngestJob {
IngestManager ingestManager = IngestManager.getInstance(); IngestManager ingestManager = IngestManager.getInstance();
this.dataSourceJobs.values().stream().forEach((job) -> { this.dataSourceJobs.values().stream().forEach((job) -> {
job.cancel(); job.cancel();
ingestManager.fireDataSourceAnalysisCancelled(id, job.getId(), job.getDataSource());
}); });
this.cancelled = true; this.cancelled = true;
} }

6
Core/src/org/sleuthkit/autopsy/keywordsearchservice/KeywordSearchService.java
View File

@ -35,4 +35,10 @@ public interface KeywordSearchService extends Closeable {
* @throws org.sleuthkit.datamodel.TskCoreException * @throws org.sleuthkit.datamodel.TskCoreException
*/ */
public void indexArtifact(BlackboardArtifact artifact) throws TskCoreException; public void indexArtifact(BlackboardArtifact artifact) throws TskCoreException;
/**
* Are we able to connect to the remote Solr server.
* @return true if we can connect, otherwise false
*/
public boolean canConnectToRemoteSolrServer();
} }

2
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
View File

@ -984,7 +984,7 @@ public class Server {
} }
} }
private HttpSolrServer connectToRemoteSolrServer() { HttpSolrServer connectToRemoteSolrServer() {
String host = UserPreferences.getIndexingServerHost(); String host = UserPreferences.getIndexingServerHost();
String port = UserPreferences.getIndexingServerPort(); String port = UserPreferences.getIndexingServerPort();

17
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java
View File

@ -20,11 +20,15 @@ package org.sleuthkit.autopsy.keywordsearch;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; 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.BlackboardArtifact;
import org.sleuthkit.datamodel.BlackboardAttribute; import org.sleuthkit.datamodel.BlackboardAttribute;
import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchService; import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchService;
import org.apache.solr.common.util.ContentStreamBase.StringStream; import org.apache.solr.common.util.ContentStreamBase.StringStream;
import org.openide.util.Exceptions;
import org.openide.util.lookup.ServiceProvider; import org.openide.util.lookup.ServiceProvider;
import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.datamodel.ContentUtils; import org.sleuthkit.autopsy.datamodel.ContentUtils;
@ -145,6 +149,19 @@ public class SolrSearchService implements KeywordSearchService {
} }
} }
@Override
public boolean canConnectToRemoteSolrServer() {
try {
HttpSolrServer solrServer = KeywordSearch.getServer().connectToRemoteSolrServer();
CoreAdminRequest.getStatus(null, solrServer);
}
catch (SolrServerException | IOException ex) {
return false;
}
return true;
}
@Override @Override
public void close() throws IOException { public void close() throws IOException {
} }

2
thirdparty/crt/update.bat vendored
View File

@ -3,5 +3,7 @@ REM Needs to be run from a 64-bit command prompt
REM Otherwise Windows will put 32-bit dlls in system32 REM Otherwise Windows will put 32-bit dlls in system32
copy c:\windows\system32\msvcr100.dll win64 copy c:\windows\system32\msvcr100.dll win64
copy c:\windows\system32\msvcp100.dll win64 copy c:\windows\system32\msvcp100.dll win64
copy c:\windows\system32\msvcr120.dll win64
copy c:\windows\sysWoW64\msvcr100.dll win32 copy c:\windows\sysWoW64\msvcr100.dll win32
copy c:\windows\sysWow64\msvcp100.dll win32 copy c:\windows\sysWow64\msvcp100.dll win32
copy c:\windows\sysWow64\msvcr120.dll win32

BIN
thirdparty/crt/win64/msvcr120.dll vendored Executable file
View File

Binary file not shown.