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 pull request #3054 from dgrove727/Aid20_FixedBundleMessages

Browse Source 
Aid20 fixed bundle messages
This commit is contained in:
Richard Cordovano 2017-09-08 11:03:30 -04:00 committed by GitHub
commit f00a9e52f1
12 changed files with 390 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestControlPanel.java
View File

@ -53,13 +53,9 @@ import org.netbeans.api.options.OptionsDisplayer;
import org.openide.DialogDisplayer; import org.openide.DialogDisplayer;
import org.openide.LifecycleManager; import org.openide.LifecycleManager;
import org.openide.NotifyDescriptor; import org.openide.NotifyDescriptor;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
import org.openide.util.actions.CallableSystemAction; import org.openide.util.NbBundle.Messages;
import org.openide.windows.WindowManager; import org.openide.windows.WindowManager;
import org.sleuthkit.autopsy.casemodule.CaseNewAction;
import org.sleuthkit.autopsy.casemodule.CaseOpenAction;
import org.sleuthkit.autopsy.core.ServicesMonitor; import org.sleuthkit.autopsy.core.ServicesMonitor;
import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
import org.sleuthkit.autopsy.coreutils.NetworkUtils; import org.sleuthkit.autopsy.coreutils.NetworkUtils;
@ -119,20 +115,33 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
* allows the columns of the table model to be described by either an enum * allows the columns of the table model to be described by either an enum
* ordinal or a column header string. * ordinal or a column header string.
*/ */
@Messages({
"AutoIngestControlPanel.JobsTableModel.ColumnHeader.Case=Case",
"AutoIngestControlPanel.JobsTableModel.ColumnHeader.ImageFolder=Data Source",
"AutoIngestControlPanel.JobsTableModel.ColumnHeader.HostName=Host Name",
"AutoIngestControlPanel.JobsTableModel.ColumnHeader.CreatedTime=Job Created",
"AutoIngestControlPanel.JobsTableModel.ColumnHeader.StartedTime=Stage Started",
"AutoIngestControlPanel.JobsTableModel.ColumnHeader.CompletedTime=Job Completed",
"AutoIngestControlPanel.JobsTableModel.ColumnHeader.Stage=Stage",
"AutoIngestControlPanel.JobsTableModel.ColumnHeader.Status=Status",
"AutoIngestControlPanel.JobsTableModel.ColumnHeader.CaseFolder=Case Folder",
"AutoIngestControlPanel.JobsTableModel.ColumnHeader.LocalJob= Local Job?",
"AutoIngestControlPanel.JobsTableModel.ColumnHeader.ManifestFilePath= Manifest File Path"
})
private enum JobsTableModelColumns { private enum JobsTableModelColumns {
CASE(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.Case")), CASE(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.Case")),
DATA_SOURCE(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.ImageFolder")), DATA_SOURCE(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.ImageFolder")),
HOST_NAME(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.HostName")), HOST_NAME(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.HostName")),
CREATED_TIME(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.CreatedTime")), CREATED_TIME(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.CreatedTime")),
STARTED_TIME(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.StartedTime")), STARTED_TIME(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.StartedTime")),
COMPLETED_TIME(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.CompletedTime")), COMPLETED_TIME(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.CompletedTime")),
STAGE(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.Stage")), STAGE(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.Stage")),
STAGE_TIME(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.StageTime")), STAGE_TIME(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.StageTime")),
STATUS(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.Status")), STATUS(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.Status")),
CASE_DIRECTORY_PATH(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.CaseFolder")), CASE_DIRECTORY_PATH(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.CaseFolder")),
IS_LOCAL_JOB(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.LocalJob")), IS_LOCAL_JOB(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.LocalJob")),
MANIFEST_FILE_PATH(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.ManifestFilePath")); MANIFEST_FILE_PATH(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.ManifestFilePath"));
private final String header; private final String header;
@ -182,37 +191,49 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
* controlling automated ingest for a single node within the cluster. * controlling automated ingest for a single node within the cluster.
*/ */
private AutoIngestControlPanel() { private AutoIngestControlPanel() {
//Disable the main window so they can only use the dashboard (if we used setVisible the taskBar icon would go away) //DLG: Temporary code for troubleshooting. Remove when done!
WindowManager.getDefault().getMainWindow().setEnabled(false); manager = null;
pendingTableModel = null;
manager = AutoIngestManager.getInstance(); runningTableModel = null;
completedTableModel = null;
//////////////////////////////////////////////////////////////
try {
//Disable the main window so they can only use the dashboard (if we used setVisible the taskBar icon would go away)
WindowManager.getDefault().getMainWindow().setEnabled(false);
pendingTableModel = new DefaultTableModel(JobsTableModelColumns.headers, 0) { manager = AutoIngestManager.getInstance();
private static final long serialVersionUID = 1L;
@Override pendingTableModel = new DefaultTableModel(JobsTableModelColumns.headers, 0) {
public boolean isCellEditable(int row, int column) { private static final long serialVersionUID = 1L;
return false;
}
};
runningTableModel = new DefaultTableModel(JobsTableModelColumns.headers, 0) { @Override
private static final long serialVersionUID = 1L; public boolean isCellEditable(int row, int column) {
return false;
}
};
@Override runningTableModel = new DefaultTableModel(JobsTableModelColumns.headers, 0) {
public boolean isCellEditable(int row, int column) { private static final long serialVersionUID = 1L;
return false;
}
};
completedTableModel = new DefaultTableModel(JobsTableModelColumns.headers, 0) { @Override
private static final long serialVersionUID = 1L; public boolean isCellEditable(int row, int column) {
return false;
}
};
@Override completedTableModel = new DefaultTableModel(JobsTableModelColumns.headers, 0) {
public boolean isCellEditable(int row, int column) { private static final long serialVersionUID = 1L;
return false;
} @Override
}; public boolean isCellEditable(int row, int column) {
return false;
}
};
} catch (Throwable ex) {
//DLG: Temporary code for troubleshooting.
SYS_LOGGER.log(Level.SEVERE, "AutoIngestControlPanel() error:", ex);
}
initComponents(); // Generated code. initComponents(); // Generated code.
setServicesStatusMessage(); setServicesStatusMessage();
@ -231,6 +252,12 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
* Queries the services monitor and sets the text for the services status * Queries the services monitor and sets the text for the services status
* text box. * text box.
*/ */
@Messages({
"AutoIngestControlPanel.tbServicesStatusMessage.Message=Case databases {0}, keyword search {1}, coordination {2}, messaging {3} ",
"AutoIngestControlPanel.tbServicesStatusMessage.Message.Up=up",
"AutoIngestControlPanel.tbServicesStatusMessage.Message.Down=down",
"AutoIngestControlPanel.tbServicesStatusMessage.Message.Unknown=unknown"
})
private void setServicesStatusMessage() { private void setServicesStatusMessage() {
new SwingWorker<Void, Void>() { new SwingWorker<Void, Void>() {
@ -254,14 +281,14 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
* @return The status string. * @return The status string.
*/ */
private String getServiceStatus(ServicesMonitor.Service service) { private String getServiceStatus(ServicesMonitor.Service service) {
String serviceStatus = NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.tbServicesStatusMessage.Message.Unknown"); String serviceStatus = NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.tbServicesStatusMessage.Message.Unknown");
try { try {
ServicesMonitor servicesMonitor = ServicesMonitor.getInstance(); ServicesMonitor servicesMonitor = ServicesMonitor.getInstance();
serviceStatus = servicesMonitor.getServiceStatus(service.toString()); serviceStatus = servicesMonitor.getServiceStatus(service.toString());
if (serviceStatus.compareTo(ServicesMonitor.ServiceStatus.UP.toString()) == 0) { if (serviceStatus.compareTo(ServicesMonitor.ServiceStatus.UP.toString()) == 0) {
serviceStatus = NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.tbServicesStatusMessage.Message.Up"); serviceStatus = NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.tbServicesStatusMessage.Message.Up");
} else { } else {
serviceStatus = NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.tbServicesStatusMessage.Message.Down"); serviceStatus = NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.tbServicesStatusMessage.Message.Down");
} }
} catch (ServicesMonitor.ServicesMonitorException ex) { } catch (ServicesMonitor.ServicesMonitorException ex) {
SYS_LOGGER.log(Level.SEVERE, String.format("Dashboard error getting service status for %s", service), ex); SYS_LOGGER.log(Level.SEVERE, String.format("Dashboard error getting service status for %s", service), ex);
@ -271,8 +298,8 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
@Override @Override
protected void done() { protected void done() {
tbServicesStatusMessage.setText(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.tbServicesStatusMessage.Message", caseDatabaseServerStatus, keywordSearchServiceStatus, keywordSearchServiceStatus, messagingStatus)); tbServicesStatusMessage.setText(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.tbServicesStatusMessage.Message", caseDatabaseServerStatus, keywordSearchServiceStatus, keywordSearchServiceStatus, messagingStatus));
String upStatus = NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.tbServicesStatusMessage.Message.Up"); String upStatus = NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.tbServicesStatusMessage.Message.Up");
if (caseDatabaseServerStatus.compareTo(upStatus) != 0 if (caseDatabaseServerStatus.compareTo(upStatus) != 0
|| keywordSearchServiceStatus.compareTo(upStatus) != 0 || keywordSearchServiceStatus.compareTo(upStatus) != 0
|| messagingStatus.compareTo(upStatus) != 0) { || messagingStatus.compareTo(upStatus) != 0) {
@ -554,12 +581,12 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
enablePendingTableButtons(false); enablePendingTableButtons(false);
bnShowCaseLog.setEnabled(false); bnShowCaseLog.setEnabled(false);
bnReprocessJob.setEnabled(false); bnReprocessJob.setEnabled(false);
bnPause.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.bnStart.text")); bnPause.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.bnStart.text"));
bnPause.setToolTipText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.bnStart.toolTipText")); bnPause.setToolTipText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.bnStart.toolTipText"));
bnPause.setEnabled(true); //initial label for bnPause is 'Start' and it's enabled for user to start the process bnPause.setEnabled(true); //initial label for bnPause is 'Start' and it's enabled for user to start the process
bnRefresh.setEnabled(false); //at initial stage, nothing to refresh bnRefresh.setEnabled(false); //at initial stage, nothing to refresh
enableRunningTableButtons(false); enableRunningTableButtons(false);
tbStatusMessage.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.bnStart.startMessage")); tbStatusMessage.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.bnStart.startMessage"));
} }
/** /**
@ -598,12 +625,12 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
autoIngestStarted = true; autoIngestStarted = true;
} catch (AutoIngestManager.AutoIngestManagerStartupException ex) { } catch (AutoIngestManager.AutoIngestManagerStartupException ex) {
SYS_LOGGER.log(Level.SEVERE, "Dashboard error starting up auto ingest", ex); SYS_LOGGER.log(Level.SEVERE, "Dashboard error starting up auto ingest", ex);
tbStatusMessage.setText(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.AutoIngestStartupError")); tbStatusMessage.setText(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.AutoIngestStartupError"));
manager = null; manager = null;
JOptionPane.showMessageDialog(this, JOptionPane.showMessageDialog(this,
NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.AutoIngestStartupFailed.Message"), NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.AutoIngestStartupFailed.Message"),
NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.AutoIngestStartupFailed.Title"), NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.AutoIngestStartupFailed.Title"),
JOptionPane.ERROR_MESSAGE); JOptionPane.ERROR_MESSAGE);
bnOptions.setEnabled(true); bnOptions.setEnabled(true);
@ -632,13 +659,13 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
updateExecutor.submit(new UpdateAllJobsTablesTask()); updateExecutor.submit(new UpdateAllJobsTablesTask());
manager.scanInputDirsNow(); manager.scanInputDirsNow();
//bnPause.setEnabled(true); //bnPause.setEnabled(true);
bnPause.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.bnPause.text")); bnPause.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.bnPause.text"));
bnPause.setToolTipText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.bnPause.toolTipText")); bnPause.setToolTipText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.bnPause.toolTipText"));
bnRefresh.setEnabled(true); bnRefresh.setEnabled(true);
bnOptions.setEnabled(false); bnOptions.setEnabled(false);
tbStatusMessage.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.bnPause.running")); tbStatusMessage.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.bnPause.running"));
} }
/** /**
@ -655,13 +682,13 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
* was grabbing the monitor? * was grabbing the monitor?
*/ */
Object[] options = { Object[] options = {
NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.OK"), NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.OK"),
NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.Cancel")}; NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.Cancel")};
int reply = JOptionPane.OK_OPTION; int reply = JOptionPane.OK_OPTION;
if (null != manager && IngestManager.getInstance().isIngestRunning()) { if (null != manager && IngestManager.getInstance().isIngestRunning()) {
reply = JOptionPane.showOptionDialog(this, reply = JOptionPane.showOptionDialog(this,
NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.ExitConsequences"), NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.ExitConsequences"),
NbBundle.getMessage(AutoIngestControlPanel.class, "ConfirmationDialog.ConfirmExitHeader"), NbBundle.getMessage(AutoIngestControlPanel.class, "ConfirmationDialog.ConfirmExitHeader"),
JOptionPane.DEFAULT_OPTION, JOptionPane.DEFAULT_OPTION,
JOptionPane.WARNING_MESSAGE, JOptionPane.WARNING_MESSAGE,
@ -675,7 +702,7 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
* appears (if there is time to see it). * appears (if there is time to see it).
*/ */
this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
tbStatusMessage.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.ExitingStatus")); tbStatusMessage.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.ExitingStatus"));
/* /*
* Shut down the table refresh task executor. * Shut down the table refresh task executor.
@ -716,7 +743,7 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
/** /**
* @inheritDoc * @inheritDoc
*/ */
@NbBundle.Messages({ @Messages({
"AutoIngestControlPanel.bnPause.paused=Paused", "AutoIngestControlPanel.bnPause.paused=Paused",
"AutoIngestControlPanel.PauseDueToDatabaseServiceDown=Paused, unable to communicate with case database service.", "AutoIngestControlPanel.PauseDueToDatabaseServiceDown=Paused, unable to communicate with case database service.",
"AutoIngestControlPanel.PauseDueToKeywordSearchServiceDown=Paused, unable to communicate with keyword search service.", "AutoIngestControlPanel.PauseDueToKeywordSearchServiceDown=Paused, unable to communicate with keyword search service.",
@ -743,7 +770,7 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
break; break;
case PAUSED_BY_REQUEST: case PAUSED_BY_REQUEST:
EventQueue.invokeLater(() -> { EventQueue.invokeLater(() -> {
tbStatusMessage.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.bnPause.paused")); tbStatusMessage.setText(Bundle.AutoIngestControlPanel_bnPause_paused());
bnOptions.setEnabled(true); bnOptions.setEnabled(true);
bnRefresh.setEnabled(false); bnRefresh.setEnabled(false);
isPaused = true; isPaused = true;
@ -799,8 +826,8 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
/** /**
* Change the pause button text and tool tip to make it a resume button. * Change the pause button text and tool tip to make it a resume button.
*/ */
bnPause.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.bnResume.text")); bnPause.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.bnResume.text"));
bnPause.setToolTipText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.bnPause.toolTipTextResume")); bnPause.setToolTipText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.bnPause.toolTipTextResume"));
if (buttonClicked) { if (buttonClicked) {
/** /**
@ -825,9 +852,9 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
* Change the resume button text and tool tip to make it a pause button. * Change the resume button text and tool tip to make it a pause button.
*/ */
bnOptions.setEnabled(false); bnOptions.setEnabled(false);
bnPause.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.bnPause.text")); bnPause.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.bnPause.text"));
bnPause.setToolTipText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.bnPause.toolTipText")); bnPause.setToolTipText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.bnPause.toolTipText"));
tbStatusMessage.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.bnPause.running")); tbStatusMessage.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.bnPause.running"));
bnRefresh.setEnabled(true); bnRefresh.setEnabled(true);
/** /**
@ -1061,7 +1088,7 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
tableModel.setRowCount(0); tableModel.setRowCount(0);
for (AutoIngestJob job : jobs) { for (AutoIngestJob job : jobs) {
AutoIngestJob.StageDetails status = job.getStageDetails(); AutoIngestJob.StageDetails status = job.getStageDetails();
ManifestNodeData nodeData = job.getNodeData(); AutoIngestJobNodeData nodeData = job.getNodeData();
tableModel.addRow(new Object[]{ tableModel.addRow(new Object[]{
nodeData.getCaseName(), // CASE nodeData.getCaseName(), // CASE
nodeData.getDataSourcePath().getFileName(), // DATA_SOURCE nodeData.getDataSourcePath().getFileName(), // DATA_SOURCE
@ -1080,11 +1107,11 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
SYS_LOGGER.log(Level.SEVERE, "Dashboard error refreshing table", ex); SYS_LOGGER.log(Level.SEVERE, "Dashboard error refreshing table", ex);
} }
} }
/** /**
* Get the current lists of jobs and update the UI. * Get the current lists of jobs and update the UI.
*/ */
private void refreshTables(){ private void refreshTables() {
JobsSnapshot jobsSnapshot = manager.getCurrentJobsSnapshot(); JobsSnapshot jobsSnapshot = manager.getCurrentJobsSnapshot();
refreshTable(jobsSnapshot.getCompletedJobs(), completedTableModel, null); refreshTable(jobsSnapshot.getCompletedJobs(), completedTableModel, null);
refreshTable(jobsSnapshot.getPendingJobs(), pendingTableModel, null); refreshTable(jobsSnapshot.getPendingJobs(), pendingTableModel, null);
@ -1449,6 +1476,9 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
* *
* @param evt The button click event. * @param evt The button click event.
*/ */
@Messages({
"AutoIngestControlPanel.DeletionFailed=Deletion failed for job"
})
private void bnDeleteCaseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnDeleteCaseActionPerformed private void bnDeleteCaseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnDeleteCaseActionPerformed
if (completedTableModel.getRowCount() < 0 || completedTable.getSelectedRow() < 0) { if (completedTableModel.getRowCount() < 0 || completedTable.getSelectedRow() < 0) {
return; return;
@ -1481,12 +1511,12 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
if (CaseDeletionResult.FAILED == result) { if (CaseDeletionResult.FAILED == result) {
JOptionPane.showMessageDialog(this, JOptionPane.showMessageDialog(this,
String.format("Could not delete case %s. It may be in in use.", caseName), String.format("Could not delete case %s. It may be in in use.", caseName),
org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.DeletionFailed"), org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.DeletionFailed"),
JOptionPane.INFORMATION_MESSAGE); JOptionPane.INFORMATION_MESSAGE);
} else if (CaseDeletionResult.PARTIALLY_DELETED == result) { } else if (CaseDeletionResult.PARTIALLY_DELETED == result) {
JOptionPane.showMessageDialog(this, JOptionPane.showMessageDialog(this,
String.format("Could not delete case %s. See system log for details.", caseName), String.format("Could not delete case %s. See system log for details.", caseName),
org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.DeletionFailed"), org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.DeletionFailed"),
JOptionPane.INFORMATION_MESSAGE); JOptionPane.INFORMATION_MESSAGE);
} }
} }
@ -1539,8 +1569,11 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
* *
* @param evt The button click event. * @param evt The button click event.
*/ */
@Messages({
"AutoIngestControlPanel.bnPause.pausing=Pausing after current job completes..."
})
private void bnPauseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnPauseActionPerformed private void bnPauseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnPauseActionPerformed
if (!autoIngestStarted) { if (!autoIngestStarted) {
//put up a wait cursor during the start up operation //put up a wait cursor during the start up operation
this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
@ -1552,7 +1585,7 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
return; return;
} }
if (!isPaused) { if (!isPaused) {
tbStatusMessage.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.bnPause.pausing")); tbStatusMessage.setText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.bnPause.pausing"));
pause(true); pause(true);
} else { } else {
resume(); resume();
@ -1634,6 +1667,10 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
* *
* @param evt The button click event. * @param evt The button click event.
*/ */
@Messages({
"AutoIngestControlPanel.ShowLogFailed.Title=Unable to display case log",
"AutoIngestControlPanel.ShowLogFailed.Message=Case log file does not exist"
})
private void bnShowCaseLogActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnShowCaseLogActionPerformed private void bnShowCaseLogActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnShowCaseLogActionPerformed
try { try {
int selectedRow = completedTable.getSelectedRow(); int selectedRow = completedTable.getSelectedRow();
@ -1644,8 +1681,8 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
if (pathToLog.toFile().exists()) { if (pathToLog.toFile().exists()) {
Desktop.getDesktop().edit(pathToLog.toFile()); Desktop.getDesktop().edit(pathToLog.toFile());
} else { } else {
JOptionPane.showMessageDialog(this, org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.ShowLogFailed.Message"), JOptionPane.showMessageDialog(this, org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.ShowLogFailed.Message"),
org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.ShowLogFailed.Title"), JOptionPane.ERROR_MESSAGE); org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.ShowLogFailed.Title"), JOptionPane.ERROR_MESSAGE);
} }
} else { } else {
MessageNotifyUtil.Message.warn("The case directory for this job has been deleted."); MessageNotifyUtil.Message.warn("The case directory for this job has been deleted.");
@ -1729,4 +1766,4 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
private javax.swing.JTextField tbStatusMessage; private javax.swing.JTextField tbStatusMessage;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
} }

17
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestDashboard.form
View File

@ -16,10 +16,11 @@
<Layout> <Layout>
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0"> <Group type="102" alignment="1" attributes="0">
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="1" attributes="0">
<Group type="102" attributes="0"> <Component id="pendingScrollPane" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="lbPending" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="lbPending" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="lbCompleted" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="lbCompleted" alignment="0" min="-2" max="-2" attributes="0"/>
@ -37,7 +38,6 @@
</Group> </Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/> <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group> </Group>
<Component id="pendingScrollPane" alignment="1" max="32767" attributes="0"/>
<Component id="runningScrollPane" alignment="0" max="32767" attributes="0"/> <Component id="runningScrollPane" alignment="0" max="32767" attributes="0"/>
<Component id="completedScrollPane" alignment="0" max="32767" attributes="0"/> <Component id="completedScrollPane" alignment="0" max="32767" attributes="0"/>
</Group> </Group>
@ -55,13 +55,13 @@
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="lbPending" min="-2" pref="23" max="-2" attributes="0"/> <Component id="lbPending" min="-2" pref="23" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace min="-2" pref="1" max="-2" attributes="0"/>
<Component id="pendingScrollPane" min="-2" pref="215" max="-2" attributes="0"/> <Component id="pendingScrollPane" min="-2" pref="215" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="lbRunning" min="-2" max="-2" attributes="0"/> <Component id="lbRunning" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace min="-2" pref="1" max="-2" attributes="0"/>
<Component id="runningScrollPane" min="-2" pref="133" max="-2" attributes="0"/> <Component id="runningScrollPane" min="-2" pref="133" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="lbCompleted" min="-2" max="-2" attributes="0"/> <Component id="lbCompleted" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="completedScrollPane" min="-2" pref="179" max="-2" attributes="0"/> <Component id="completedScrollPane" min="-2" pref="179" max="-2" attributes="0"/>
@ -186,7 +186,6 @@
<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/experimental/autoingest/Bundle.properties" key="AutoIngestDashboard.refreshButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> <ResourceString bundle="org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties" key="AutoIngestDashboard.refreshButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property> </Property>
<Property name="enabled" type="boolean" value="false"/>
</Properties> </Properties>
<Events> <Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="refreshButtonActionPerformed"/> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="refreshButtonActionPerformed"/>

130
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestDashboard.java
View File

@ -18,7 +18,6 @@
*/ */
package org.sleuthkit.autopsy.experimental.autoingest; package org.sleuthkit.autopsy.experimental.autoingest;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import java.awt.Cursor; import java.awt.Cursor;
import java.awt.EventQueue; import java.awt.EventQueue;
import java.nio.file.Path; import java.nio.file.Path;
@ -28,12 +27,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Observable; import java.util.Observable;
import java.util.Observer; import java.util.Observer;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.logging.Level; import java.util.logging.Level;
import javax.swing.DefaultListSelectionModel; import javax.swing.DefaultListSelectionModel;
import java.awt.Color; import java.awt.Color;
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeEvent;
import java.util.Collections;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JTable; import javax.swing.JTable;
import javax.swing.SwingWorker; import javax.swing.SwingWorker;
@ -42,8 +40,10 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.table.DefaultTableModel; import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableColumn; import javax.swing.table.TableColumn;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
import org.openide.util.NbBundle.Messages;
import org.sleuthkit.autopsy.core.ServicesMonitor; import org.sleuthkit.autopsy.core.ServicesMonitor;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
import org.sleuthkit.autopsy.experimental.autoingest.AutoIngestMonitor.JobsSnapshot; import org.sleuthkit.autopsy.experimental.autoingest.AutoIngestMonitor.JobsSnapshot;
/** /**
@ -73,16 +73,14 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
private static final int COMPLETED_TIME_COL_MIN_WIDTH = 30; private static final int COMPLETED_TIME_COL_MIN_WIDTH = 30;
private static final int COMPLETED_TIME_COL_MAX_WIDTH = 2000; private static final int COMPLETED_TIME_COL_MAX_WIDTH = 2000;
private static final int COMPLETED_TIME_COL_PREFERRED_WIDTH = 280; private static final int COMPLETED_TIME_COL_PREFERRED_WIDTH = 280;
private static final String UPDATE_TASKS_THREAD_NAME = "AID-update-tasks-%d";
private static final Logger logger = Logger.getLogger(AutoIngestDashboard.class.getName()); private static final Logger logger = Logger.getLogger(AutoIngestDashboard.class.getName());
private final DefaultTableModel pendingTableModel; private final DefaultTableModel pendingTableModel;
private final DefaultTableModel runningTableModel; private final DefaultTableModel runningTableModel;
private final DefaultTableModel completedTableModel; private final DefaultTableModel completedTableModel;
private AutoIngestMonitor autoIngestMonitor; private AutoIngestMonitor autoIngestMonitor;
private ExecutorService updateExecutor;
// DLG: The Viking code needs to be updated, too. See VikingStartupWindow, // DLG: The Viking code needs to be updated, too. See VikingStartupWindow,
// which should be using the AutoIngestControlPanel, not the AutoIngestDashboard. // which should be using the AutoIngestControlPanel, not the AutoIngestDashboard.
/** /**
* Creates a dashboard for monitoring an automated ingest cluster. * Creates a dashboard for monitoring an automated ingest cluster.
* *
@ -253,16 +251,16 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
pendingTable.setAutoCreateRowSorter(false); pendingTable.setAutoCreateRowSorter(false);
/* /*
* Create a row selection listener to enable/disable the prioritize * Create a row selection listener to enable/disable the Prioritize
* folder and prioritize case buttons. * button.
*/ */
pendingTable.getSelectionModel().addListSelectionListener((ListSelectionEvent e) -> { pendingTable.getSelectionModel().addListSelectionListener((ListSelectionEvent e) -> {
if (e.getValueIsAdjusting()) { if (e.getValueIsAdjusting()) {
return; return;
} }
int row = pendingTable.getSelectedRow(); int row = pendingTable.getSelectedRow();
this.prioritizeButton.setEnabled(row >= 0 && row < pendingTable.getRowCount());
}); });
} }
/** /**
@ -409,19 +407,6 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
* Prevent sorting when a column header is clicked. * Prevent sorting when a column header is clicked.
*/ */
completedTable.setAutoCreateRowSorter(false); completedTable.setAutoCreateRowSorter(false);
/*
* Create a row selection listener to enable/disable the delete case and
* show log buttons.
*/
completedTable.getSelectionModel()
.addListSelectionListener((ListSelectionEvent e) -> {
if (e.getValueIsAdjusting()) {
return;
}
int row = completedTable.getSelectedRow();
boolean enabled = row >= 0 && row < completedTable.getRowCount();
});
} }
/** /**
@ -430,18 +415,19 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
* auto ingest job tables. * auto ingest job tables.
*/ */
private void startUp() throws AutoIngestMonitor.AutoIngestMonitorException { private void startUp() throws AutoIngestMonitor.AutoIngestMonitorException {
autoIngestMonitor = AutoIngestMonitor.createMonitor(); setServicesStatusMessage();
autoIngestMonitor.addObserver(this);
updateExecutor = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat(UPDATE_TASKS_THREAD_NAME).build());
updateExecutor.submit(new GetJobsSnapshotTask());
ServicesMonitor.getInstance().addSubscriber((PropertyChangeEvent evt) -> { ServicesMonitor.getInstance().addSubscriber((PropertyChangeEvent evt) -> {
setServicesStatusMessage(); setServicesStatusMessage();
}); });
autoIngestMonitor = new AutoIngestMonitor();
autoIngestMonitor.addObserver(this);
autoIngestMonitor.startUp();
} }
@Override @Override
public void update(Observable observable, Object argument) { public void update(Observable observable, Object argument) {
updateExecutor.submit(new GetJobsSnapshotTask()); JobsSnapshot jobsSnapshot = (JobsSnapshot) argument;
EventQueue.invokeLater(new RefreshComponentsTask(jobsSnapshot));
} }
/** /**
@ -454,7 +440,11 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
List<AutoIngestJob> pendingJobs = jobsSnapshot.getPendingJobs(); List<AutoIngestJob> pendingJobs = jobsSnapshot.getPendingJobs();
List<AutoIngestJob> runningJobs = jobsSnapshot.getRunningJobs(); List<AutoIngestJob> runningJobs = jobsSnapshot.getRunningJobs();
List<AutoIngestJob> completedJobs = jobsSnapshot.getCompletedJobs(); List<AutoIngestJob> completedJobs = jobsSnapshot.getCompletedJobs();
// DLG: Do the appropriate sorts.
// DLG: DONE! Do the appropriate sorts for each table.
Collections.sort(pendingJobs, new AutoIngestJob.PriorityComparator());
runningJobs.sort(new AutoIngestJob.AlphabeticalComparator());
refreshTable(pendingJobs, pendingTable, pendingTableModel); refreshTable(pendingJobs, pendingTable, pendingTableModel);
refreshTable(runningJobs, runningTable, runningTableModel); refreshTable(runningJobs, runningTable, runningTableModel);
refreshTable(completedJobs, completedTable, completedTableModel); refreshTable(completedJobs, completedTable, completedTableModel);
@ -480,7 +470,7 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
continue; continue;
} }
AutoIngestJob.StageDetails status = job.getStageDetails(); AutoIngestJob.StageDetails status = job.getStageDetails();
ManifestNodeData nodeData = job.getNodeData(); AutoIngestJobNodeData nodeData = job.getNodeData();
tableModel.addRow(new Object[]{ tableModel.addRow(new Object[]{
nodeData.getCaseName(), // CASE nodeData.getCaseName(), // CASE
nodeData.getDataSourcePath().getFileName(), // DATA_SOURCE nodeData.getDataSourcePath().getFileName(), // DATA_SOURCE
@ -557,7 +547,7 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
*/ */
private enum JobsTableModelColumns { private enum JobsTableModelColumns {
// DLG: Go through the bundles.properties file and delete and unused key-value pairs. // DLG: Go through the bundles.properties file and delete any unused key-value pairs.
CASE(NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.Case")), CASE(NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.Case")),
DATA_SOURCE(NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.ImageFolder")), DATA_SOURCE(NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.ImageFolder")),
HOST_NAME(NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.HostName")), HOST_NAME(NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.HostName")),
@ -580,6 +570,15 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
return header; return header;
} }
/*
* DLG: We need to add the AutoIngestJob object for the row to the
* table. As a model you can look in AutoIngestControlPanel to see how a
* boolean is stored in a hidden IS_LOCAL_JOB column and do something
* similar for the job. Once youy hjave done that, you can change the
* button event handler for the Prioritize button to make it pass the
* AutoIngestJob to the AutoIngestMonitor instead of the manifest file
* path.
*/
private static final String[] headers = { private static final String[] headers = {
CASE.getColumnHeader(), CASE.getColumnHeader(),
DATA_SOURCE.getColumnHeader(), DATA_SOURCE.getColumnHeader(),
@ -594,25 +593,6 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
MANIFEST_FILE_PATH.getColumnHeader()}; MANIFEST_FILE_PATH.getColumnHeader()};
} }
/**
* A task that gets the current snapshot of the pending, running and
* completed auto ingest jobs lists for an auto ingest cluster from the auto
* ingest monitor, sorts them, and queues a UI components refresh task for
* execution in the EDT.
*/
private class GetJobsSnapshotTask implements Runnable {
@Override
public void run() {
AutoIngestMonitor.JobsSnapshot jobsSnapshot = autoIngestMonitor.getJobsSnapshot();
List<AutoIngestJob> pendingJobs = jobsSnapshot.getPendingJobs();
List<AutoIngestJob> runningJobs = jobsSnapshot.getRunningJobs();
List<AutoIngestJob> completedJobs = jobsSnapshot.getCompletedJobs();
// DLG: Do the appropriate sorts in this background task.
EventQueue.invokeLater(new RefreshComponentsTask(pendingJobs, runningJobs, completedJobs));
}
}
/** /**
* A task that refreshes the UI components on this panel to reflect a * A task that refreshes the UI components on this panel to reflect a
* snapshot of the pending, running and completed auto ingest jobs lists of * snapshot of the pending, running and completed auto ingest jobs lists of
@ -620,31 +600,22 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
*/ */
private class RefreshComponentsTask implements Runnable { private class RefreshComponentsTask implements Runnable {
private final List<AutoIngestJob> pendingJobs; private final JobsSnapshot jobsSnapshot;
private final List<AutoIngestJob> runningJobs;
private final List<AutoIngestJob> completedJobs;
/** /**
* Constructs a task that refreshes the UI components on this panel to * Constructs a task that refreshes the UI components on this panel to
* reflect a snapshot of the pending, running and completed auto ingest * reflect a snapshot of the pending, running and completed auto ingest
* jobs lists of an auto ingest cluster. * jobs lists of an auto ingest cluster.
* *
* @param pendingJobs The pending jobs list. * @param jobsSnapshot The jobs snapshot.
* @param runningJobs The running jobs list.
* @param completedJobs The completed jobs list.
*/ */
RefreshComponentsTask(List<AutoIngestJob> pendingJobs, List<AutoIngestJob> runningJobs, List<AutoIngestJob> completedJobs) { RefreshComponentsTask(JobsSnapshot jobsSnapshot) {
this.pendingJobs = pendingJobs; this.jobsSnapshot = jobsSnapshot;
this.runningJobs = runningJobs;
this.completedJobs = completedJobs;
} }
@Override @Override
public void run() { public void run() {
refreshTable(pendingJobs, pendingTable, pendingTableModel); refreshTables(jobsSnapshot);
refreshTable(runningJobs, runningTable, runningTableModel);
refreshTable(completedJobs, completedTable, completedTableModel);
refreshButton.setEnabled(true);
} }
} }
@ -678,7 +649,7 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
} }
} }
/** /**
* This method is called from within the constructor to initialize the form. * This method is called from within the constructor to initialize the form.
* WARNING: Do NOT modify this code. The content of this method is always * WARNING: Do NOT modify this code. The content of this method is always
@ -767,7 +738,6 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
org.openide.awt.Mnemonics.setLocalizedText(refreshButton, org.openide.util.NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.refreshButton.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(refreshButton, org.openide.util.NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.refreshButton.text")); // NOI18N
refreshButton.setToolTipText(org.openide.util.NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.refreshButton.toolTipText")); // NOI18N refreshButton.setToolTipText(org.openide.util.NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.refreshButton.toolTipText")); // NOI18N
refreshButton.setEnabled(false);
refreshButton.addActionListener(new java.awt.event.ActionListener() { refreshButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
refreshButtonActionPerformed(evt); refreshButtonActionPerformed(evt);
@ -795,10 +765,11 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
this.setLayout(layout); this.setLayout(layout);
layout.setHorizontalGroup( layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addGroup(layout.createSequentialGroup() .addComponent(pendingScrollPane)
.addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lbPending) .addComponent(lbPending)
.addComponent(lbCompleted) .addComponent(lbCompleted)
@ -812,9 +783,8 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(prioritizeButton, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE))) .addComponent(prioritizeButton, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addGap(0, 0, Short.MAX_VALUE)) .addGap(0, 0, Short.MAX_VALUE))
.addComponent(pendingScrollPane, javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(runningScrollPane, javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(runningScrollPane) .addComponent(completedScrollPane, javax.swing.GroupLayout.Alignment.LEADING))
.addComponent(completedScrollPane))
.addContainerGap()) .addContainerGap())
); );
layout.setVerticalGroup( layout.setVerticalGroup(
@ -826,13 +796,13 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
.addComponent(tbServicesStatusMessage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(tbServicesStatusMessage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(lbPending, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(lbPending, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGap(1, 1, 1)
.addComponent(pendingScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 215, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(pendingScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 215, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(lbRunning) .addComponent(lbRunning)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGap(1, 1, 1)
.addComponent(runningScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 133, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(runningScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 133, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(lbCompleted) .addComponent(lbCompleted)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(completedScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 179, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(completedScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 179, javax.swing.GroupLayout.PREFERRED_SIZE)
@ -858,6 +828,9 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
}//GEN-LAST:event_refreshButtonActionPerformed }//GEN-LAST:event_refreshButtonActionPerformed
@Messages({
"AutoIngestDashboard.PrioritizeError=Failed to prioritize job \"%s\"."
})
private void prioritizeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_prioritizeButtonActionPerformed private void prioritizeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_prioritizeButtonActionPerformed
if (pendingTableModel.getRowCount() > 0 && pendingTable.getSelectedRow() >= 0) { if (pendingTableModel.getRowCount() > 0 && pendingTable.getSelectedRow() >= 0) {
setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
@ -867,8 +840,11 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
jobsSnapshot = autoIngestMonitor.prioritizeJob(manifestFilePath); jobsSnapshot = autoIngestMonitor.prioritizeJob(manifestFilePath);
refreshTables(jobsSnapshot); refreshTables(jobsSnapshot);
} catch (AutoIngestMonitor.AutoIngestMonitorException ex) { } catch (AutoIngestMonitor.AutoIngestMonitorException ex) {
// DLG: Log the exception and do a popup with a user-friendly // DLG: DONE! Log the exception and do a popup with a user-friendly
// message explaining that the operation failed // message explaining that the operation failed
String errorMessage = String.format(NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.PrioritizeError"), manifestFilePath);
logger.log(Level.SEVERE, errorMessage, ex);
MessageNotifyUtil.Message.error(errorMessage);
} }
setCursor(Cursor.getDefaultCursor()); setCursor(Cursor.getDefaultCursor());
} }
@ -890,4 +866,4 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
private javax.swing.JTextField tbServicesStatusMessage; private javax.swing.JTextField tbServicesStatusMessage;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
} }

25
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestDashboardTopComponent.java
View File

@ -26,6 +26,7 @@ import org.openide.windows.Mode;
import org.openide.windows.TopComponent; import org.openide.windows.TopComponent;
import org.openide.windows.WindowManager; import org.openide.windows.WindowManager;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
/** /**
* Top component which displays the Auto Ingest Dashboard interface. * Top component which displays the Auto Ingest Dashboard interface.
@ -41,11 +42,18 @@ import org.sleuthkit.autopsy.coreutils.Logger;
"CTL_AutoIngestDashboardTopComponent=Auto Ingest Dashboard"}) "CTL_AutoIngestDashboardTopComponent=Auto Ingest Dashboard"})
public final class AutoIngestDashboardTopComponent extends TopComponent { public final class AutoIngestDashboardTopComponent extends TopComponent {
private static final long serialVersionUID = 1L;
public final static String PREFERRED_ID = "AutoIngestDashboardTopComponent"; // NON-NLS public final static String PREFERRED_ID = "AutoIngestDashboardTopComponent"; // NON-NLS
private static final Logger logger = Logger.getLogger(AutoIngestDashboardTopComponent.class.getName()); private static final Logger logger = Logger.getLogger(AutoIngestDashboardTopComponent.class.getName());
private static boolean topComponentInitialized = false; private static boolean topComponentInitialized = false;
@Messages({
"AutoIngestDashboardTopComponent.exceptionMessage.failedToCreateDashboard=Failed to create Auto Ingest Dashboard.",})
public static void openTopComponent() { public static void openTopComponent() {
/*
* DLG: Please make the top component initial size big enough to show
* the whole dashboard.
*/
final AutoIngestDashboardTopComponent tc = (AutoIngestDashboardTopComponent) WindowManager.getDefault().findTopComponent(PREFERRED_ID); final AutoIngestDashboardTopComponent tc = (AutoIngestDashboardTopComponent) WindowManager.getDefault().findTopComponent(PREFERRED_ID);
if (tc != null) { if (tc != null) {
topComponentInitialized = true; topComponentInitialized = true;
@ -59,15 +67,15 @@ public final class AutoIngestDashboardTopComponent extends TopComponent {
try { try {
dashboard = AutoIngestDashboard.createDashboard(); dashboard = AutoIngestDashboard.createDashboard();
tc.add(dashboard); tc.add(dashboard);
dashboard.setSize(dashboard.getPreferredSize()); dashboard.setSize(992, 744);
if (tc.isOpened() == false) { if (tc.isOpened() == false) {
tc.open(); tc.open();
} }
tc.toFront(); tc.toFront();
tc.requestActive(); tc.requestActive();
} catch (AutoIngestDashboard.AutoIngestDashboardException ex) { } catch (AutoIngestDashboard.AutoIngestDashboardException ex) {
// DLG: Catch the exception, log it, and pop up an error dialog logger.log(Level.SEVERE, "Unable to create auto ingest dashboard", ex);
// with a user-friendly message MessageNotifyUtil.Message.error(Bundle.AutoIngestDashboardTopComponent_exceptionMessage_failedToCreateDashboard());
} }
} }
} }
@ -129,5 +137,4 @@ public final class AutoIngestDashboardTopComponent extends TopComponent {
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
} }

34
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJob.java
View File

@ -41,10 +41,10 @@ public final class AutoIngestJob implements Comparable<AutoIngestJob>, Serializa
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final String LOCAL_HOST_NAME = NetworkUtils.getLocalHostName(); private static final String LOCAL_HOST_NAME = NetworkUtils.getLocalHostName();
private final ManifestNodeData nodeData; private final AutoIngestJobNodeData nodeData;
private final String nodeName; private final String nodeName;
@GuardedBy("this") @GuardedBy("this")
private String caseDirectoryPath; // DLG: Replace with ManifestNodeData.caseDirectoryPath private String caseDirectoryPath; // DLG: Replace with AutoIngestJobNodeData.caseDirectoryPath
@GuardedBy("this") @GuardedBy("this")
private Stage stage; private Stage stage;
@GuardedBy("this") @GuardedBy("this")
@ -62,7 +62,7 @@ public final class AutoIngestJob implements Comparable<AutoIngestJob>, Serializa
* Constructs an automated ingest job for a manifest. The manifest specifies * Constructs an automated ingest job for a manifest. The manifest specifies
* a co-located data source and a case to which the data source is to be * a co-located data source and a case to which the data source is to be
* added. * added.
* *
* Note: Manifest objects will be phased out and no longer be part of the * Note: Manifest objects will be phased out and no longer be part of the
* AutoIngestJob class. * AutoIngestJob class.
* *
@ -73,7 +73,14 @@ public final class AutoIngestJob implements Comparable<AutoIngestJob>, Serializa
* processing, otherwise the locla host. * processing, otherwise the locla host.
* @param stage The processing stage for display purposes. * @param stage The processing stage for display purposes.
*/ */
AutoIngestJob(ManifestNodeData nodeData, Path caseDirectoryPath, String nodeName, Stage stage) { /*
* DLG: We need a contrucotr that takes just the node data. When we have
* added the case dierectory path, the host name and the stage data to the
* ZK nodes, we probably cna use that constructor only. I'm thinking this
* because we will creater node data with initial values when we first
* discover the nodes, and then we will continue to update it.
*/
AutoIngestJob(AutoIngestJobNodeData nodeData, Path caseDirectoryPath, String nodeName, Stage stage) {
this.nodeData = nodeData; this.nodeData = nodeData;
if (null != caseDirectoryPath) { if (null != caseDirectoryPath) {
this.caseDirectoryPath = caseDirectoryPath.toString(); this.caseDirectoryPath = caseDirectoryPath.toString();
@ -90,7 +97,7 @@ public final class AutoIngestJob implements Comparable<AutoIngestJob>, Serializa
* *
* @return The node data. * @return The node data.
*/ */
ManifestNodeData getNodeData() { AutoIngestJobNodeData getNodeData() {
return this.nodeData; return this.nodeData;
} }
@ -234,10 +241,10 @@ public final class AutoIngestJob implements Comparable<AutoIngestJob>, Serializa
if (obj == this) { if (obj == this) {
return true; return true;
} }
Path manifestPath1 = this.getNodeData().getManifestFilePath(); Path manifestPath1 = this.getNodeData().getManifestFilePath();
Path manifestPath2 = ((AutoIngestJob)obj).getNodeData().getManifestFilePath(); Path manifestPath2 = ((AutoIngestJob) obj).getNodeData().getManifestFilePath();
return manifestPath1.equals(manifestPath2); return manifestPath1.equals(manifestPath2);
} }
@ -251,11 +258,16 @@ public final class AutoIngestJob implements Comparable<AutoIngestJob>, Serializa
public int compareTo(AutoIngestJob o) { public int compareTo(AutoIngestJob o) {
Date date1 = this.getNodeData().getManifestFileDate(); Date date1 = this.getNodeData().getManifestFileDate();
Date date2 = o.getNodeData().getManifestFileDate(); Date date2 = o.getNodeData().getManifestFileDate();
return -date1.compareTo(date2); return -date1.compareTo(date2);
} }
// DLG: Add a toString override // DLG: Add a toString override
@Override
public String toString() {
// DLG: FINISH ME!
return "";
}
/** /**
* Custom comparator that allows us to sort List<AutoIngestJob> on reverse * Custom comparator that allows us to sort List<AutoIngestJob> on reverse
@ -278,7 +290,7 @@ public final class AutoIngestJob implements Comparable<AutoIngestJob>, Serializa
public int compare(AutoIngestJob job, AutoIngestJob anotherJob) { public int compare(AutoIngestJob job, AutoIngestJob anotherJob) {
Integer priority1 = job.getNodeData().getPriority(); Integer priority1 = job.getNodeData().getPriority();
Integer priority2 = anotherJob.getNodeData().getPriority(); Integer priority2 = anotherJob.getNodeData().getPriority();
return -priority1.compareTo(priority2); return -priority1.compareTo(priority2);
} }
@ -300,7 +312,7 @@ public final class AutoIngestJob implements Comparable<AutoIngestJob>, Serializa
} else { } else {
String caseName1 = o1.getNodeData().getCaseName(); String caseName1 = o1.getNodeData().getCaseName();
String caseName2 = o2.getNodeData().getCaseName(); String caseName2 = o2.getNodeData().getCaseName();
return caseName1.compareToIgnoreCase(caseName2); return caseName1.compareToIgnoreCase(caseName2);
} }
} }

170
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ManifestNodeData.java → Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJobNodeData.java
View File

@ -1,7 +1,7 @@
/* /*
* Autopsy Forensic Browser * Autopsy Forensic Browser
* *
* Copyright 2015-2017 Basis Technology Corp. * Copyright 2011-2017 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");
@ -26,34 +26,60 @@ import java.util.Date;
import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeKind;
/** /**
* A coordination service node data transfer object for an auto ingest job * A coordination service node data transfer object for an auto ingest job.
* manifest. The data include: processing status, priority, the number of times
* the auto ingest job for the manifest has crashed during processing, and the
* date the auto ingest job for the manifest was completed.
*/ */
final class ManifestNodeData implements Serializable { final class AutoIngestJobNodeData implements Serializable {
private static final int NODE_DATA_VERSION = 2; private static final long serialVersionUID = 1L;
private static final int MAX_POSSIBLE_NODE_DATA_SIZE = 65831; private static final int NODE_DATA_VERSION = 1;
private static final int MAX_POSSIBLE_NODE_DATA_SIZE = 131493;
private static final int DEFAULT_PRIORITY = 0; private static final int DEFAULT_PRIORITY = 0;
/*
* Version 0 fields.
*/
private final boolean coordSvcNodeDataWasSet; private final boolean coordSvcNodeDataWasSet;
private ProcessingStatus status; private ProcessingStatus status;
private int priority; private int priority;
private int numberOfCrashes; private int numberOfCrashes;
private long completedDate; private long completedDate;
private boolean errorsOccurred; private boolean errorsOccurred;
// These are not used by version '1' nodes. /*
* Version 1 fields.
*/
private int version; private int version;
private String deviceId; private String deviceId;
private String caseName; private String caseName;
private String caseDirectoryPath;
private long manifestFileDate; private long manifestFileDate;
private String manifestFilePath; private String manifestFilePath;
private String dataSourcePath; private String dataSourcePath;
//DLG: Add caseDirectoryPath from AutoIngestJob private String processingStage;
private long processingStageStartDate;
private String processingHost;
//DLG: Add caseDirectoryPath from AutoIngestJob
/*
* DLG: Rename class to AutoIngestJobNodeData - Add String
* caseDirectoryPath. Needed to locate case auto ingest log and later, for
* case deletion
*
* Add String processingStage, long processingStageStartDate, String
* processingHost fields. These three fields are needed to populate running
* jobs table; use of auto ingest job data is not enough, because there
* would be no data until a status event was received by the auto ingest
* monitor.
*
* Update the AutoIngestManager code that creates ZK nodes for auto ingest
* jobs to write the new fields described above to new nodes
*
* Update the AutoIngestManager code that publishes auto ingest status
* events for the current job to update the the processing status fields
* described above in addition to publishing AutoIngestJobStatusEvents.
* Probably also need to write this data initially when a jo becomes the
* current job.
*/
/** /**
* Constructs a coordination service node data data transfer object for an * Constructs a coordination service node data data transfer object for an
* auto ingest manifest from the raw bytes obtained from the coordination * auto ingest manifest from the raw bytes obtained from the coordination
@ -61,7 +87,7 @@ final class ManifestNodeData implements Serializable {
* *
* @param nodeData The raw bytes received from the coordination service. * @param nodeData The raw bytes received from the coordination service.
*/ */
ManifestNodeData(byte[] nodeData) throws ManifestNodeDataException { AutoIngestJobNodeData(byte[] nodeData) throws AutoIngestJobNodeDataException {
ByteBuffer buffer = ByteBuffer.wrap(nodeData); ByteBuffer buffer = ByteBuffer.wrap(nodeData);
this.coordSvcNodeDataWasSet = buffer.hasRemaining(); this.coordSvcNodeDataWasSet = buffer.hasRemaining();
if (this.coordSvcNodeDataWasSet) { if (this.coordSvcNodeDataWasSet) {
@ -72,7 +98,7 @@ final class ManifestNodeData implements Serializable {
this.status = ProcessingStatus.PROCESSING; this.status = ProcessingStatus.PROCESSING;
} else if (ProcessingStatus.COMPLETED.ordinal() == rawStatus) { } else if (ProcessingStatus.COMPLETED.ordinal() == rawStatus) {
this.status = ProcessingStatus.COMPLETED; this.status = ProcessingStatus.COMPLETED;
}else if (ProcessingStatus.DELETED.ordinal() == rawStatus) { } else if (ProcessingStatus.DELETED.ordinal() == rawStatus) {
this.status = ProcessingStatus.DELETED; this.status = ProcessingStatus.DELETED;
} }
this.priority = buffer.getInt(); this.priority = buffer.getInt();
@ -87,28 +113,36 @@ final class ManifestNodeData implements Serializable {
this.completedDate = 0L; this.completedDate = 0L;
this.errorsOccurred = false; this.errorsOccurred = false;
} }
if(buffer.hasRemaining()) { if (buffer.hasRemaining()) {
// Version is greater than 1 /*
* There are more than 24 bytes in the buffer, so we assume the
* version is greater than '0'.
*/
this.version = buffer.getInt(); this.version = buffer.getInt();
if(this.version > NODE_DATA_VERSION) { if (this.version > NODE_DATA_VERSION) {
throw new ManifestNodeDataException(String.format( throw new AutoIngestJobNodeDataException(String.format("Node data version %d is not suppored.", this.version));
"Node data version %d is not suppored.",
this.version));
} }
this.deviceId = getStringFromBuffer(buffer, TypeKind.BYTE); this.deviceId = getStringFromBuffer(buffer, TypeKind.BYTE);
this.caseName = getStringFromBuffer(buffer, TypeKind.BYTE); this.caseName = getStringFromBuffer(buffer, TypeKind.BYTE);
//DLG: this.caseDirectoryPath = getStringFromBuffer(buffer, TypeKind.SHORT);
this.manifestFileDate = buffer.getLong(); this.manifestFileDate = buffer.getLong();
this.manifestFilePath = getStringFromBuffer(buffer, TypeKind.SHORT); this.manifestFilePath = getStringFromBuffer(buffer, TypeKind.SHORT);
this.dataSourcePath = getStringFromBuffer(buffer, TypeKind.SHORT); this.dataSourcePath = getStringFromBuffer(buffer, TypeKind.SHORT);
} //DLG: this.processingStage = getStringFromBuffer(buffer, TypeKind.BYTE);
else { //DLG: this.processingStageStartDate = buffer.getLong();
this.version = 1; //DLG: this.processingHost = getStringFromBuffer(buffer, TypeKind.SHORT);
} else {
this.version = 0;
this.deviceId = ""; this.deviceId = "";
this.caseName = ""; this.caseName = "";
this.caseDirectoryPath = "";
this.manifestFileDate = 0L; this.manifestFileDate = 0L;
this.manifestFilePath = ""; this.manifestFilePath = "";
this.dataSourcePath = ""; this.dataSourcePath = "";
this.processingStage = "";
this.processingStageStartDate = 0L;
this.processingHost = "";
} }
} }
@ -125,14 +159,14 @@ final class ManifestNodeData implements Serializable {
* completed. * completed.
* @param errorsOccurred Boolean to determine if errors have occurred. * @param errorsOccurred Boolean to determine if errors have occurred.
*/ */
ManifestNodeData(Manifest manifest, ProcessingStatus status, int priority, int numberOfCrashes, Date completedDate, boolean errorOccurred) { AutoIngestJobNodeData(Manifest manifest, ProcessingStatus status, int priority, int numberOfCrashes, Date completedDate, boolean errorOccurred) {
this.coordSvcNodeDataWasSet = false; this.coordSvcNodeDataWasSet = false;
this.status = status; this.status = status;
this.priority = priority; this.priority = priority;
this.numberOfCrashes = numberOfCrashes; this.numberOfCrashes = numberOfCrashes;
this.completedDate = completedDate.getTime(); this.completedDate = completedDate.getTime();
this.errorsOccurred = errorOccurred; this.errorsOccurred = errorOccurred;
this.version = NODE_DATA_VERSION; this.version = NODE_DATA_VERSION;
this.deviceId = manifest.getDeviceId(); this.deviceId = manifest.getDeviceId();
this.caseName = manifest.getCaseName(); this.caseName = manifest.getCaseName();
@ -253,55 +287,55 @@ final class ManifestNodeData implements Serializable {
void setErrorsOccurred(boolean errorsOccurred) { void setErrorsOccurred(boolean errorsOccurred) {
this.errorsOccurred = errorsOccurred; this.errorsOccurred = errorsOccurred;
} }
/** /**
* Get the node data version. * Get the node data version.
* *
* @return The node data version. * @return The node data version.
*/ */
int getVersion() { int getVersion() {
return this.version; return this.version;
} }
/** /**
* Set the node data version. * Set the node data version.
* *
* @param version The node data version. * @param version The node data version.
*/ */
void setVersion(int version) { void setVersion(int version) {
this.version = version; this.version = version;
} }
/** /**
* Get the device ID. * Get the device ID.
* *
* @return The device ID. * @return The device ID.
*/ */
String getDeviceId() { String getDeviceId() {
return this.deviceId; return this.deviceId;
} }
/** /**
* Set the device ID. * Set the device ID.
* *
* @param deviceId The device ID. * @param deviceId The device ID.
*/ */
void setDeviceId(String deviceId) { void setDeviceId(String deviceId) {
this.deviceId = deviceId; this.deviceId = deviceId;
} }
/** /**
* Get the case name. * Get the case name.
* *
* @return The case name. * @return The case name.
*/ */
String getCaseName() { String getCaseName() {
return this.caseName; return this.caseName;
} }
/** /**
* Set the case name. * Set the case name.
* *
* @param caseName The case name. * @param caseName The case name.
*/ */
void setCaseName(String caseName) { void setCaseName(String caseName) {
@ -329,32 +363,32 @@ final class ManifestNodeData implements Serializable {
void setManifestFileDate(Date manifestFileDate) { void setManifestFileDate(Date manifestFileDate) {
this.manifestFileDate = manifestFileDate.getTime(); this.manifestFileDate = manifestFileDate.getTime();
} }
/** /**
* Get the manifest file path. * Get the manifest file path.
* *
* @return The manifest file path. * @return The manifest file path.
*/ */
Path getManifestFilePath() { Path getManifestFilePath() {
return Paths.get(this.manifestFilePath); return Paths.get(this.manifestFilePath);
} }
/** /**
* Set the manifest file path. * Set the manifest file path.
* *
* @param manifestFilePath The manifest file path. * @param manifestFilePath The manifest file path.
*/ */
void setManifestFilePath(Path manifestFilePath) { void setManifestFilePath(Path manifestFilePath) {
if (manifestFilePath != null) { if (manifestFilePath != null) {
this.manifestFilePath = manifestFilePath.toString(); this.manifestFilePath = manifestFilePath.toString();
} else { } else {
this.manifestFilePath = ""; this.manifestFilePath = "";
} }
} }
/** /**
* Get the data source path. * Get the data source path.
* *
* @return The data source path. * @return The data source path.
*/ */
Path getDataSourcePath() { Path getDataSourcePath() {
@ -363,21 +397,21 @@ final class ManifestNodeData implements Serializable {
/** /**
* Get the file name portion of the data source path. * Get the file name portion of the data source path.
* *
* @return The data source file name. * @return The data source file name.
*/ */
public String getDataSourceFileName() { public String getDataSourceFileName() {
return Paths.get(dataSourcePath).getFileName().toString(); return Paths.get(dataSourcePath).getFileName().toString();
} }
/** /**
* Set the data source path. * Set the data source path.
* *
* @param dataSourcePath The data source path. * @param dataSourcePath The data source path.
*/ */
void setDataSourcePath(Path dataSourcePath) { void setDataSourcePath(Path dataSourcePath) {
if (dataSourcePath != null) { if (dataSourcePath != null) {
this.dataSourcePath = dataSourcePath.toString(); this.dataSourcePath = dataSourcePath.toString();
} else { } else {
this.dataSourcePath = ""; this.dataSourcePath = "";
} }
@ -391,39 +425,43 @@ final class ManifestNodeData implements Serializable {
*/ */
byte[] toArray() { byte[] toArray() {
ByteBuffer buffer = ByteBuffer.allocate(MAX_POSSIBLE_NODE_DATA_SIZE); ByteBuffer buffer = ByteBuffer.allocate(MAX_POSSIBLE_NODE_DATA_SIZE);
// Write data (compatible with version 0) // Write data (compatible with version 0)
buffer.putInt(this.status.ordinal()); buffer.putInt(this.status.ordinal());
buffer.putInt(this.priority); buffer.putInt(this.priority);
buffer.putInt(this.numberOfCrashes); buffer.putInt(this.numberOfCrashes);
buffer.putLong(this.completedDate); buffer.putLong(this.completedDate);
buffer.putInt(this.errorsOccurred ? 1 : 0); buffer.putInt(this.errorsOccurred ? 1 : 0);
if(this.version > 0) { if (this.version > 0) {
// Write version // Write version
buffer.putInt(this.version); buffer.putInt(this.version);
// Write data // Write data
putStringIntoBuffer(deviceId, buffer, TypeKind.BYTE); putStringIntoBuffer(deviceId, buffer, TypeKind.BYTE);
putStringIntoBuffer(caseName, buffer, TypeKind.BYTE); putStringIntoBuffer(caseName, buffer, TypeKind.BYTE);
//DLG: putStringIntoBuffer(caseDirectoryPath, buffer, TypeKind.SHORT);
buffer.putLong(this.manifestFileDate); buffer.putLong(this.manifestFileDate);
putStringIntoBuffer(manifestFilePath, buffer, TypeKind.SHORT); putStringIntoBuffer(manifestFilePath, buffer, TypeKind.SHORT);
putStringIntoBuffer(dataSourcePath, buffer, TypeKind.SHORT); putStringIntoBuffer(dataSourcePath, buffer, TypeKind.SHORT);
//DLG: putStringIntoBuffer(processingStage, buffer, TypeKind.BYTE);
//DLG: buffer.putLong(this.processingStageStartDate);
//DLG: putStringIntoBuffer(processingHost, buffer, TypeKind.SHORT);
} }
// Prepare the array // Prepare the array
byte[] array = new byte[buffer.position()]; byte[] array = new byte[buffer.position()];
buffer.rewind(); buffer.rewind();
buffer.get(array, 0, array.length); buffer.get(array, 0, array.length);
return array; return array;
} }
private String getStringFromBuffer(ByteBuffer buffer, TypeKind lengthType) { private String getStringFromBuffer(ByteBuffer buffer, TypeKind lengthType) {
int length = 0; int length = 0;
String output = ""; String output = "";
switch(lengthType) { switch (lengthType) {
case BYTE: case BYTE:
length = buffer.get(); length = buffer.get();
break; break;
@ -431,26 +469,26 @@ final class ManifestNodeData implements Serializable {
length = buffer.getShort(); length = buffer.getShort();
break; break;
} }
if(length > 0) { if (length > 0) {
byte[] array = new byte[length]; byte[] array = new byte[length];
buffer.get(array, 0, length); buffer.get(array, 0, length);
output = new String(array); output = new String(array);
} }
return output; return output;
} }
private void putStringIntoBuffer(String stringValue, ByteBuffer buffer, TypeKind lengthType) { private void putStringIntoBuffer(String stringValue, ByteBuffer buffer, TypeKind lengthType) {
switch(lengthType) { switch (lengthType) {
case BYTE: case BYTE:
buffer.put((byte)stringValue.length()); buffer.put((byte) stringValue.length());
break; break;
case SHORT: case SHORT:
buffer.putShort((short)stringValue.length()); buffer.putShort((short) stringValue.length());
break; break;
} }
buffer.put(stringValue.getBytes()); buffer.put(stringValue.getBytes());
} }

6
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ManifestNodeDataException.java → Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJobNodeDataException.java
View File

@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.experimental.autoingest;
/** /**
* Exception thrown when a manifest node contains incompatible data. * Exception thrown when a manifest node contains incompatible data.
*/ */
public class ManifestNodeDataException extends Exception { public class AutoIngestJobNodeDataException extends Exception {
/** /**
* Constructs an exception thrown when a manifest node contains incompatible * Constructs an exception thrown when a manifest node contains incompatible
@ -29,7 +29,7 @@ public class ManifestNodeDataException extends Exception {
* *
* @param message An error message. * @param message An error message.
*/ */
public ManifestNodeDataException(String message) { public AutoIngestJobNodeDataException(String message) {
super(message); super(message);
} }
@ -40,7 +40,7 @@ public class ManifestNodeDataException extends Exception {
* @param message An error message. * @param message An error message.
* @param cause An exception that caused this exception to be thrown. * @param cause An exception that caused this exception to be thrown.
*/ */
public ManifestNodeDataException(String message, Throwable cause) { public AutoIngestJobNodeDataException(String message, Throwable cause) {
super(message, cause); super(message, cause);
} }
} }

64
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java
View File

@ -84,11 +84,11 @@ import org.sleuthkit.autopsy.experimental.autoingest.AutoIngestAlertFile.AutoIng
import org.sleuthkit.autopsy.experimental.autoingest.AutoIngestJobLogger.AutoIngestJobLoggerException; import org.sleuthkit.autopsy.experimental.autoingest.AutoIngestJobLogger.AutoIngestJobLoggerException;
import org.sleuthkit.autopsy.experimental.autoingest.FileExporter.FileExportException; import org.sleuthkit.autopsy.experimental.autoingest.FileExporter.FileExportException;
import org.sleuthkit.autopsy.experimental.autoingest.ManifestFileParser.ManifestFileParserException; import org.sleuthkit.autopsy.experimental.autoingest.ManifestFileParser.ManifestFileParserException;
import org.sleuthkit.autopsy.experimental.autoingest.ManifestNodeData.ProcessingStatus; import org.sleuthkit.autopsy.experimental.autoingest.AutoIngestJobNodeData.ProcessingStatus;
import static org.sleuthkit.autopsy.experimental.autoingest.ManifestNodeData.ProcessingStatus.COMPLETED; import static org.sleuthkit.autopsy.experimental.autoingest.AutoIngestJobNodeData.ProcessingStatus.COMPLETED;
import static org.sleuthkit.autopsy.experimental.autoingest.ManifestNodeData.ProcessingStatus.DELETED; import static org.sleuthkit.autopsy.experimental.autoingest.AutoIngestJobNodeData.ProcessingStatus.DELETED;
import static org.sleuthkit.autopsy.experimental.autoingest.ManifestNodeData.ProcessingStatus.PENDING; import static org.sleuthkit.autopsy.experimental.autoingest.AutoIngestJobNodeData.ProcessingStatus.PENDING;
import static org.sleuthkit.autopsy.experimental.autoingest.ManifestNodeData.ProcessingStatus.PROCESSING; import static org.sleuthkit.autopsy.experimental.autoingest.AutoIngestJobNodeData.ProcessingStatus.PROCESSING;
import org.sleuthkit.autopsy.experimental.configuration.AutoIngestUserPreferences; import org.sleuthkit.autopsy.experimental.configuration.AutoIngestUserPreferences;
import org.sleuthkit.autopsy.experimental.configuration.SharedConfiguration; import org.sleuthkit.autopsy.experimental.configuration.SharedConfiguration;
import org.sleuthkit.autopsy.experimental.configuration.SharedConfiguration.SharedConfigurationException; import org.sleuthkit.autopsy.experimental.configuration.SharedConfiguration.SharedConfigurationException;
@ -543,10 +543,10 @@ public final class AutoIngestManager extends Observable implements PropertyChang
for (AutoIngestJob job : prioritizedJobs) { for (AutoIngestJob job : prioritizedJobs) {
String manifestNodePath = job.getNodeData().getManifestFilePath().toString(); String manifestNodePath = job.getNodeData().getManifestFilePath().toString();
try { try {
ManifestNodeData nodeData = new ManifestNodeData(coordinationService.getNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestNodePath)); AutoIngestJobNodeData nodeData = new AutoIngestJobNodeData(coordinationService.getNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestNodePath));
nodeData.setPriority(maxPriority); nodeData.setPriority(maxPriority);
coordinationService.setNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestNodePath, nodeData.toArray()); coordinationService.setNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestNodePath, nodeData.toArray());
} catch (ManifestNodeDataException ex) { } catch (AutoIngestJobNodeDataException ex) {
SYS_LOGGER.log(Level.WARNING, String.format("Unable to use node data for %s", manifestNodePath), ex); SYS_LOGGER.log(Level.WARNING, String.format("Unable to use node data for %s", manifestNodePath), ex);
} catch (CoordinationServiceException ex) { } catch (CoordinationServiceException ex) {
SYS_LOGGER.log(Level.SEVERE, String.format("Coordination service error while prioritizing %s", manifestNodePath), ex); SYS_LOGGER.log(Level.SEVERE, String.format("Coordination service error while prioritizing %s", manifestNodePath), ex);
@ -592,10 +592,10 @@ public final class AutoIngestManager extends Observable implements PropertyChang
++maxPriority; ++maxPriority;
String manifestNodePath = prioritizedJob.getNodeData().getManifestFilePath().toString(); String manifestNodePath = prioritizedJob.getNodeData().getManifestFilePath().toString();
try { try {
ManifestNodeData nodeData = new ManifestNodeData(coordinationService.getNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestNodePath)); AutoIngestJobNodeData nodeData = new AutoIngestJobNodeData(coordinationService.getNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestNodePath));
nodeData.setPriority(maxPriority); nodeData.setPriority(maxPriority);
coordinationService.setNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestNodePath, nodeData.toArray()); coordinationService.setNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestNodePath, nodeData.toArray());
} catch (ManifestNodeDataException ex) { } catch (AutoIngestJobNodeDataException ex) {
SYS_LOGGER.log(Level.WARNING, String.format("Unable to use node data for %s", manifestPath), ex); SYS_LOGGER.log(Level.WARNING, String.format("Unable to use node data for %s", manifestPath), ex);
} catch (CoordinationServiceException ex) { } catch (CoordinationServiceException ex) {
SYS_LOGGER.log(Level.SEVERE, String.format("Coordination service error while prioritizing %s", manifestNodePath), ex); SYS_LOGGER.log(Level.SEVERE, String.format("Coordination service error while prioritizing %s", manifestNodePath), ex);
@ -636,7 +636,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
if (null != completedJob && null != completedJob.getCaseDirectoryPath()) { if (null != completedJob && null != completedJob.getCaseDirectoryPath()) {
try { try {
ManifestNodeData nodeData = completedJob.getNodeData(); AutoIngestJobNodeData nodeData = completedJob.getNodeData();
nodeData.setStatus(PENDING); nodeData.setStatus(PENDING);
nodeData.setPriority(DEFAULT_JOB_PRIORITY); nodeData.setPriority(DEFAULT_JOB_PRIORITY);
nodeData.setNumberOfCrashes(0); nodeData.setNumberOfCrashes(0);
@ -733,10 +733,10 @@ public final class AutoIngestManager extends Observable implements PropertyChang
*/ */
for (Path manifestPath : manifestPaths) { for (Path manifestPath : manifestPaths) {
try { try {
ManifestNodeData nodeData = new ManifestNodeData(coordinationService.getNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestPath.toString())); AutoIngestJobNodeData nodeData = new AutoIngestJobNodeData(coordinationService.getNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestPath.toString()));
nodeData.setStatus(ManifestNodeData.ProcessingStatus.DELETED); nodeData.setStatus(AutoIngestJobNodeData.ProcessingStatus.DELETED);
coordinationService.setNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestPath.toString(), nodeData.toArray()); coordinationService.setNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestPath.toString(), nodeData.toArray());
} catch (ManifestNodeDataException ex) { } catch (AutoIngestJobNodeDataException ex) {
SYS_LOGGER.log(Level.WARNING, String.format("Unable to use node data for %s", manifestPath), ex); SYS_LOGGER.log(Level.WARNING, String.format("Unable to use node data for %s", manifestPath), ex);
} catch (InterruptedException | CoordinationServiceException ex) { } catch (InterruptedException | CoordinationServiceException ex) {
SYS_LOGGER.log(Level.SEVERE, String.format("Error attempting to set delete flag on manifest data for %s for case %s at %s", manifestPath, caseName, caseDirectoryPath), ex); SYS_LOGGER.log(Level.SEVERE, String.format("Error attempting to set delete flag on manifest data for %s for case %s at %s", manifestPath, caseName, caseDirectoryPath), ex);
@ -1027,7 +1027,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
byte[] rawData = coordinationService.getNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestPath.toString()); byte[] rawData = coordinationService.getNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestPath.toString());
if (null != rawData) { if (null != rawData) {
try { try {
ManifestNodeData nodeData = new ManifestNodeData(rawData); AutoIngestJobNodeData nodeData = new AutoIngestJobNodeData(rawData);
if (nodeData.coordSvcNodeDataWasSet()) { if (nodeData.coordSvcNodeDataWasSet()) {
ProcessingStatus processingStatus = nodeData.getStatus(); ProcessingStatus processingStatus = nodeData.getStatus();
switch (processingStatus) { switch (processingStatus) {
@ -1050,7 +1050,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
} else { } else {
addNewPendingJob(manifest); addNewPendingJob(manifest);
} }
} catch(ManifestNodeDataException ex) { } catch(AutoIngestJobNodeDataException ex) {
SYS_LOGGER.log(Level.WARNING, String.format("Unable to use node data for %s", manifestPath), ex); SYS_LOGGER.log(Level.WARNING, String.format("Unable to use node data for %s", manifestPath), ex);
} }
} else { } else {
@ -1078,7 +1078,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
* @param nodeData The data stored in the coordination service node for * @param nodeData The data stored in the coordination service node for
* the manifest. * the manifest.
*/ */
private void addPendingJob(ManifestNodeData nodeData) { private void addPendingJob(AutoIngestJobNodeData nodeData) {
Path caseDirectory = PathUtils.findCaseDirectory(rootOutputDirectory, nodeData.getCaseName()); Path caseDirectory = PathUtils.findCaseDirectory(rootOutputDirectory, nodeData.getCaseName());
nodeData.setCompletedDate(new Date(0)); nodeData.setCompletedDate(new Date(0));
nodeData.setErrorsOccurred(false); nodeData.setErrorsOccurred(false);
@ -1100,7 +1100,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
// Is use of Curator.create().forPath() possible instead? // Is use of Curator.create().forPath() possible instead?
try (Lock manifestLock = coordinationService.tryGetExclusiveLock(CoordinationService.CategoryNode.MANIFESTS, manifest.getFilePath().toString())) { try (Lock manifestLock = coordinationService.tryGetExclusiveLock(CoordinationService.CategoryNode.MANIFESTS, manifest.getFilePath().toString())) {
if (null != manifestLock) { if (null != manifestLock) {
ManifestNodeData newNodeData = new ManifestNodeData(manifest, PENDING, DEFAULT_JOB_PRIORITY, 0, new Date(0), false); AutoIngestJobNodeData newNodeData = new AutoIngestJobNodeData(manifest, PENDING, DEFAULT_JOB_PRIORITY, 0, new Date(0), false);
coordinationService.setNodeData(CoordinationService.CategoryNode.MANIFESTS, manifest.getFilePath().toString(), newNodeData.toArray()); coordinationService.setNodeData(CoordinationService.CategoryNode.MANIFESTS, manifest.getFilePath().toString(), newNodeData.toArray());
newPendingJobsList.add(new AutoIngestJob(newNodeData, null, LOCAL_HOST_NAME, AutoIngestJob.Stage.PENDING)); newPendingJobsList.add(new AutoIngestJob(newNodeData, null, LOCAL_HOST_NAME, AutoIngestJob.Stage.PENDING));
} }
@ -1124,7 +1124,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
* blocked, i.e., if auto ingest is * blocked, i.e., if auto ingest is
* shutting down. * shutting down.
*/ */
private void doRecoveryIfCrashed(ManifestNodeData nodeData) throws InterruptedException { private void doRecoveryIfCrashed(AutoIngestJobNodeData nodeData) throws InterruptedException {
String manifestPath = nodeData.getManifestFilePath().toString(); String manifestPath = nodeData.getManifestFilePath().toString();
if (nodeData.coordSvcNodeDataWasSet() && ProcessingStatus.PROCESSING == nodeData.getStatus()) { if (nodeData.coordSvcNodeDataWasSet() && ProcessingStatus.PROCESSING == nodeData.getStatus()) {
SYS_LOGGER.log(Level.SEVERE, "Attempting crash recovery for {0}", manifestPath); SYS_LOGGER.log(Level.SEVERE, "Attempting crash recovery for {0}", manifestPath);
@ -1180,7 +1180,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
* @param nodeData The data stored in the coordination service node for * @param nodeData The data stored in the coordination service node for
* the manifest. * the manifest.
*/ */
private void addCompletedJob(ManifestNodeData nodeData) { private void addCompletedJob(AutoIngestJobNodeData nodeData) {
Path caseDirectoryPath = PathUtils.findCaseDirectory(rootOutputDirectory, nodeData.getCaseName()); Path caseDirectoryPath = PathUtils.findCaseDirectory(rootOutputDirectory, nodeData.getCaseName());
if (null != caseDirectoryPath) { if (null != caseDirectoryPath) {
newCompletedJobsList.add(new AutoIngestJob(nodeData, caseDirectoryPath, LOCAL_HOST_NAME, AutoIngestJob.Stage.COMPLETED)); newCompletedJobsList.add(new AutoIngestJob(nodeData, caseDirectoryPath, LOCAL_HOST_NAME, AutoIngestJob.Stage.COMPLETED));
@ -1518,7 +1518,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
return; return;
} }
processJob(); processJob();
} catch (ManifestNodeDataException ex) { } catch (AutoIngestJobNodeDataException ex) {
SYS_LOGGER.log(Level.WARNING, String.format("Unable to use node data"), ex); SYS_LOGGER.log(Level.WARNING, String.format("Unable to use node data"), ex);
} finally { } finally {
manifestLock.release(); manifestLock.release();
@ -1619,7 +1619,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
} }
try { try {
ManifestNodeData nodeData = new ManifestNodeData(coordinationService.getNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestPath.toString())); AutoIngestJobNodeData nodeData = new AutoIngestJobNodeData(coordinationService.getNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestPath.toString()));
if (!nodeData.getStatus().equals(PENDING)) { if (!nodeData.getStatus().equals(PENDING)) {
/* /*
* Due to a timing issue or a missed event, a * Due to a timing issue or a missed event, a
@ -1646,7 +1646,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
iterator.remove(); iterator.remove();
currentJob = job; currentJob = job;
break; break;
} catch (ManifestNodeDataException ex) { } catch (AutoIngestJobNodeDataException ex) {
SYS_LOGGER.log(Level.WARNING, String.format("Unable to use node data for %s", manifestPath), ex); SYS_LOGGER.log(Level.WARNING, String.format("Unable to use node data for %s", manifestPath), ex);
} }
} }
@ -1692,9 +1692,9 @@ public final class AutoIngestManager extends Observable implements PropertyChang
* i.e., if auto ingest is * i.e., if auto ingest is
* shutting down. * shutting down.
*/ */
private void processJob() throws CoordinationServiceException, SharedConfigurationException, ServicesMonitorException, DatabaseServerDownException, KeywordSearchServerDownException, CaseManagementException, AnalysisStartupException, FileExportException, AutoIngestAlertFileException, AutoIngestJobLoggerException, InterruptedException, AutoIngestDataSourceProcessor.AutoIngestDataSourceProcessorException, ManifestNodeDataException { private void processJob() throws CoordinationServiceException, SharedConfigurationException, ServicesMonitorException, DatabaseServerDownException, KeywordSearchServerDownException, CaseManagementException, AnalysisStartupException, FileExportException, AutoIngestAlertFileException, AutoIngestJobLoggerException, InterruptedException, AutoIngestDataSourceProcessor.AutoIngestDataSourceProcessorException, AutoIngestJobNodeDataException {
Path manifestPath = currentJob.getNodeData().getManifestFilePath(); Path manifestPath = currentJob.getNodeData().getManifestFilePath();
ManifestNodeData nodeData = new ManifestNodeData(coordinationService.getNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestPath.toString())); AutoIngestJobNodeData nodeData = new AutoIngestJobNodeData(coordinationService.getNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestPath.toString()));
nodeData.setStatus(PROCESSING); nodeData.setStatus(PROCESSING);
coordinationService.setNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestPath.toString(), nodeData.toArray()); coordinationService.setNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestPath.toString(), nodeData.toArray());
SYS_LOGGER.log(Level.INFO, "Started processing of {0}", manifestPath); SYS_LOGGER.log(Level.INFO, "Started processing of {0}", manifestPath);
@ -1713,7 +1713,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
currentJob.cancel(); currentJob.cancel();
} }
nodeData = new ManifestNodeData(coordinationService.getNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestPath.toString())); nodeData = new AutoIngestJobNodeData(coordinationService.getNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestPath.toString()));
if (currentJob.isCompleted() || currentJob.isCanceled()) { if (currentJob.isCompleted() || currentJob.isCanceled()) {
nodeData.setStatus(COMPLETED); nodeData.setStatus(COMPLETED);
Date completedDate = new Date(); Date completedDate = new Date();
@ -1799,7 +1799,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
try { try {
Case.closeCurrentCase(); Case.closeCurrentCase();
} catch (CaseActionException ex) { } catch (CaseActionException ex) {
ManifestNodeData nodeData = currentJob.getNodeData(); AutoIngestJobNodeData nodeData = currentJob.getNodeData();
throw new CaseManagementException(String.format("Error closing case %s for %s", nodeData.getCaseName(), nodeData.getManifestFilePath()), ex); throw new CaseManagementException(String.format("Error closing case %s for %s", nodeData.getCaseName(), nodeData.getManifestFilePath()), ex);
} }
} }
@ -1882,7 +1882,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
* if auto ingest is shutting down. * if auto ingest is shutting down.
*/ */
private Case openCase() throws CoordinationServiceException, CaseManagementException, InterruptedException { private Case openCase() throws CoordinationServiceException, CaseManagementException, InterruptedException {
ManifestNodeData nodeData = currentJob.getNodeData(); AutoIngestJobNodeData nodeData = currentJob.getNodeData();
String caseName = nodeData.getCaseName(); String caseName = nodeData.getCaseName();
SYS_LOGGER.log(Level.INFO, "Opening case {0} for {1}", new Object[]{caseName, nodeData.getManifestFilePath()}); SYS_LOGGER.log(Level.INFO, "Opening case {0} for {1}", new Object[]{caseName, nodeData.getManifestFilePath()});
currentJob.setStage(AutoIngestJob.Stage.OPENING_CASE); currentJob.setStage(AutoIngestJob.Stage.OPENING_CASE);
@ -2051,7 +2051,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
* if auto ingest is shutting down. * if auto ingest is shutting down.
*/ */
private DataSource identifyDataSource(Case caseForJob) throws AutoIngestAlertFileException, AutoIngestJobLoggerException, InterruptedException { private DataSource identifyDataSource(Case caseForJob) throws AutoIngestAlertFileException, AutoIngestJobLoggerException, InterruptedException {
ManifestNodeData nodeData = currentJob.getNodeData(); AutoIngestJobNodeData nodeData = currentJob.getNodeData();
Path manifestPath = nodeData.getManifestFilePath(); Path manifestPath = nodeData.getManifestFilePath();
SYS_LOGGER.log(Level.INFO, "Identifying data source for {0} ", manifestPath); SYS_LOGGER.log(Level.INFO, "Identifying data source for {0} ", manifestPath);
currentJob.setStage(AutoIngestJob.Stage.IDENTIFYING_DATA_SOURCE); currentJob.setStage(AutoIngestJob.Stage.IDENTIFYING_DATA_SOURCE);
@ -2087,7 +2087,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
* ingest is shutting down. * ingest is shutting down.
*/ */
private void runDataSourceProcessor(Case caseForJob, DataSource dataSource) throws InterruptedException, AutoIngestAlertFileException, AutoIngestJobLoggerException, AutoIngestDataSourceProcessor.AutoIngestDataSourceProcessorException { private void runDataSourceProcessor(Case caseForJob, DataSource dataSource) throws InterruptedException, AutoIngestAlertFileException, AutoIngestJobLoggerException, AutoIngestDataSourceProcessor.AutoIngestDataSourceProcessorException {
ManifestNodeData nodeData = currentJob.getNodeData(); AutoIngestJobNodeData nodeData = currentJob.getNodeData();
Path manifestPath = nodeData.getManifestFilePath(); Path manifestPath = nodeData.getManifestFilePath();
SYS_LOGGER.log(Level.INFO, "Adding data source for {0} ", manifestPath); SYS_LOGGER.log(Level.INFO, "Adding data source for {0} ", manifestPath);
currentJob.setStage(AutoIngestJob.Stage.ADDING_DATA_SOURCE); currentJob.setStage(AutoIngestJob.Stage.ADDING_DATA_SOURCE);
@ -2180,7 +2180,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
* ingest is shutting down. * ingest is shutting down.
*/ */
private void logDataSourceProcessorResult(DataSource dataSource) throws AutoIngestAlertFileException, AutoIngestJobLoggerException, InterruptedException { private void logDataSourceProcessorResult(DataSource dataSource) throws AutoIngestAlertFileException, AutoIngestJobLoggerException, InterruptedException {
ManifestNodeData nodeData = currentJob.getNodeData(); AutoIngestJobNodeData nodeData = currentJob.getNodeData();
Path manifestPath = nodeData.getManifestFilePath(); Path manifestPath = nodeData.getManifestFilePath();
Path caseDirectoryPath = currentJob.getCaseDirectoryPath(); Path caseDirectoryPath = currentJob.getCaseDirectoryPath();
AutoIngestJobLogger jobLogger = new AutoIngestJobLogger(manifestPath, nodeData.getDataSourceFileName(), caseDirectoryPath); AutoIngestJobLogger jobLogger = new AutoIngestJobLogger(manifestPath, nodeData.getDataSourceFileName(), caseDirectoryPath);
@ -2252,7 +2252,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
* ingest is shutting down. * ingest is shutting down.
*/ */
private void analyze(DataSource dataSource) throws AnalysisStartupException, AutoIngestAlertFileException, AutoIngestJobLoggerException, InterruptedException { private void analyze(DataSource dataSource) throws AnalysisStartupException, AutoIngestAlertFileException, AutoIngestJobLoggerException, InterruptedException {
ManifestNodeData nodeData = currentJob.getNodeData(); AutoIngestJobNodeData nodeData = currentJob.getNodeData();
Path manifestPath = nodeData.getManifestFilePath(); Path manifestPath = nodeData.getManifestFilePath();
SYS_LOGGER.log(Level.INFO, "Starting ingest modules analysis for {0} ", manifestPath); SYS_LOGGER.log(Level.INFO, "Starting ingest modules analysis for {0} ", manifestPath);
currentJob.setStage(AutoIngestJob.Stage.ANALYZING_DATA_SOURCE); currentJob.setStage(AutoIngestJob.Stage.ANALYZING_DATA_SOURCE);
@ -2351,7 +2351,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
* ingest is shutting down. * ingest is shutting down.
*/ */
private void exportFiles(DataSource dataSource) throws FileExportException, AutoIngestAlertFileException, AutoIngestJobLoggerException, InterruptedException { private void exportFiles(DataSource dataSource) throws FileExportException, AutoIngestAlertFileException, AutoIngestJobLoggerException, InterruptedException {
ManifestNodeData nodeData = currentJob.getNodeData(); AutoIngestJobNodeData nodeData = currentJob.getNodeData();
Path manifestPath = nodeData.getManifestFilePath(); Path manifestPath = nodeData.getManifestFilePath();
SYS_LOGGER.log(Level.INFO, "Exporting files for {0}", manifestPath); SYS_LOGGER.log(Level.INFO, "Exporting files for {0}", manifestPath);
currentJob.setStage(AutoIngestJob.Stage.EXPORTING_FILES); currentJob.setStage(AutoIngestJob.Stage.EXPORTING_FILES);

63
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestMonitor.java
View File

@ -64,28 +64,15 @@ public final class AutoIngestMonitor extends Observable implements PropertyChang
@GuardedBy("jobsLock") @GuardedBy("jobsLock")
private JobsSnapshot jobsSnapshot; private JobsSnapshot jobsSnapshot;
/**
* Creates an auto ingest monitor responsible for monitoring and reporting
* the processing of auto ingest jobs.
*
* @return The auto ingest monitor.
*
* @throws AutoIngestMonitorException If the monitor cannot be created.
*/
static AutoIngestMonitor createMonitor() throws AutoIngestMonitorException {
AutoIngestMonitor monitor = new AutoIngestMonitor();
monitor.startUp();
return monitor;
}
/** /**
* Constructs an auto ingest monitor responsible for monitoring and * Constructs an auto ingest monitor responsible for monitoring and
* reporting the processing of auto ingest jobs. * reporting the processing of auto ingest jobs.
*/ */
private AutoIngestMonitor() { AutoIngestMonitor() {
eventPublisher = new AutopsyEventPublisher(); eventPublisher = new AutopsyEventPublisher();
coordSvcQueryExecutor = new ScheduledThreadPoolExecutor(NUM_COORD_SVC_QUERY_THREADS, new ThreadFactoryBuilder().setNameFormat(COORD_SVC_QUERY_THREAD_NAME).build()); coordSvcQueryExecutor = new ScheduledThreadPoolExecutor(NUM_COORD_SVC_QUERY_THREADS, new ThreadFactoryBuilder().setNameFormat(COORD_SVC_QUERY_THREAD_NAME).build());
jobsLock = new Object(); jobsLock = new Object();
jobsSnapshot = new JobsSnapshot();
} }
/** /**
@ -94,7 +81,7 @@ public final class AutoIngestMonitor extends Observable implements PropertyChang
* @throws AutoIngestMonitorException If there is a problem starting the * @throws AutoIngestMonitorException If there is a problem starting the
* auto ingest monitor. * auto ingest monitor.
*/ */
private void startUp() throws AutoIngestMonitor.AutoIngestMonitorException { void startUp() throws AutoIngestMonitor.AutoIngestMonitorException {
try { try {
coordinationService = CoordinationService.getInstance(); coordinationService = CoordinationService.getInstance();
} catch (CoordinationServiceException ex) { } catch (CoordinationServiceException ex) {
@ -152,10 +139,12 @@ public final class AutoIngestMonitor extends Observable implements PropertyChang
* @param event A auto ingest job started event. * @param event A auto ingest job started event.
*/ */
private void handleJobStartedEvent(AutoIngestJobStartedEvent event) { private void handleJobStartedEvent(AutoIngestJobStartedEvent event) {
// DLG: Remove job from event from pending queue, if present synchronized (jobsLock) {
// DLG: Add job to running jobs list // DLG: Remove job from pending queue, if present
setChanged(); // DLG: Add job to running jobs list
notifyObservers(); setChanged();
notifyObservers(jobsSnapshot);
}
} }
/** /**
@ -164,9 +153,11 @@ public final class AutoIngestMonitor extends Observable implements PropertyChang
* @param event A auto ingest job status event. * @param event A auto ingest job status event.
*/ */
private void handleJobStatusEvent(AutoIngestJobStatusEvent event) { private void handleJobStatusEvent(AutoIngestJobStatusEvent event) {
// DLG: Replace job in running list with job from event synchronized (jobsLock) {
setChanged(); // DLG: Replace job in running list with job from event
notifyObservers(); setChanged();
notifyObservers(jobsSnapshot);
}
} }
/** /**
@ -175,10 +166,12 @@ public final class AutoIngestMonitor extends Observable implements PropertyChang
* @param event A auto ingest job completed event. * @param event A auto ingest job completed event.
*/ */
private void handleJobCompletedEvent(AutoIngestJobCompletedEvent event) { private void handleJobCompletedEvent(AutoIngestJobCompletedEvent event) {
// DLG: Remove job from event from running list, if present synchronized (jobsLock) {
// DLG: Add job to completed list // DLG: Remove job from event from running list, if present
setChanged(); // DLG: Add job to completed list
notifyObservers(); setChanged();
notifyObservers(jobsSnapshot);
}
} }
/** /**
@ -187,9 +180,11 @@ public final class AutoIngestMonitor extends Observable implements PropertyChang
* @param event A job/case prioritization event. * @param event A job/case prioritization event.
*/ */
private void handleCasePrioritizationEvent(AutoIngestCasePrioritizedEvent event) { private void handleCasePrioritizationEvent(AutoIngestCasePrioritizedEvent event) {
// DLG: Replace job in pending queue with job from event synchronized (jobsLock) {
setChanged(); // DLG: Replace job in pending queue with job from event
notifyObservers(); setChanged();
notifyObservers(jobsSnapshot);
}
} }
/** /**
@ -241,7 +236,7 @@ public final class AutoIngestMonitor extends Observable implements PropertyChang
List<String> nodeList = coordinationService.getNodeList(CoordinationService.CategoryNode.MANIFESTS); List<String> nodeList = coordinationService.getNodeList(CoordinationService.CategoryNode.MANIFESTS);
for (String node : nodeList) { for (String node : nodeList) {
// DLG: Do not need a lock here // DLG: Do not need a lock here
// DLG: Get the node data and construct a AutoIngestJobNodeData object (rename ManifestNodeData => AutoIngestJobData) // DLG: Get the node data and construct a AutoIngestJobNodeData object (rename AutoIngestJobNodeData => AutoIngestJobData)
// DLG: Construct an AutoIngestJob object from the AutoIngestJobNodeData object, need new AutoIngestJob constructor // DLG: Construct an AutoIngestJob object from the AutoIngestJobNodeData object, need new AutoIngestJob constructor
} }
return newJobsSnapshot; return newJobsSnapshot;
@ -281,15 +276,15 @@ public final class AutoIngestMonitor extends Observable implements PropertyChang
++highestPriority; ++highestPriority;
String manifestNodePath = prioritizedJob.getNodeData().getManifestFilePath().toString(); String manifestNodePath = prioritizedJob.getNodeData().getManifestFilePath().toString();
try { try {
ManifestNodeData nodeData = new ManifestNodeData(coordinationService.getNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestNodePath)); AutoIngestJobNodeData nodeData = new AutoIngestJobNodeData(coordinationService.getNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestNodePath));
nodeData.setPriority(highestPriority); nodeData.setPriority(highestPriority);
coordinationService.setNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestNodePath, nodeData.toArray()); coordinationService.setNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestNodePath, nodeData.toArray());
} catch (ManifestNodeDataException | CoordinationServiceException | InterruptedException ex) { } catch (AutoIngestJobNodeDataException | CoordinationServiceException | InterruptedException ex) {
throw new AutoIngestMonitorException("Error bumping priority for job " + prioritizedJob.toString(), ex); throw new AutoIngestMonitorException("Error bumping priority for job " + prioritizedJob.toString(), ex);
} }
prioritizedJob.getNodeData().setPriority(highestPriority); prioritizedJob.getNodeData().setPriority(highestPriority);
} }
/* /*
* Publish a prioritization event. * Publish a prioritization event.
*/ */

42
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties
View File

@ -202,7 +202,7 @@ ReviewModeCasePanel.OutputFolderHeaderText=Output Folder
ReviewModeCasePanel.LastAccessedTimeHeaderText=Last Accessed Time ReviewModeCasePanel.LastAccessedTimeHeaderText=Last Accessed Time
CopyFilesPanel.bnOptions.text=&Options CopyFilesPanel.bnOptions.text=&Options
AutoIngestDashboard.lbServicesStatus.text=Services Status: AutoIngestDashboard.lbServicesStatus.text=Services Status:
AutoIngestDashboard.tbServicesStatusMessage.text= AutoIngestDashboard.tbServicesStatusMessage.text=Connecting...
FileExporterSettingsPanel.ChooseRootDirectory=Choose a root directory for file output FileExporterSettingsPanel.ChooseRootDirectory=Choose a root directory for file output
FileExporterSettingsPanel.ChooseReportDirectory=Choose a report directory FileExporterSettingsPanel.ChooseReportDirectory=Choose a report directory
FileExporterSettingsPanel.RuleName=Rule Name FileExporterSettingsPanel.RuleName=Rule Name
@ -271,47 +271,7 @@ AutoIngestCasePanel.bnOpen.text=&Open
AutoIngestCasePanel.bnShowLog.toolTipText=Display case log file for selected case AutoIngestCasePanel.bnShowLog.toolTipText=Display case log file for selected case
AutoIngestCasePanel.bnShowLog.text=&Show Log AutoIngestCasePanel.bnShowLog.text=&Show Log
AutoIngestCasePanel.rbGroupLabel.text=Show cases accessed in the last 10: AutoIngestCasePanel.rbGroupLabel.text=Show cases accessed in the last 10:
AutoIngestControlPanel.tbStatusMessage.text=
AutoIngestControlPanel.bnShowCaseLog.toolTipText=Display case log file for selected case
AutoIngestControlPanel.bnShowCaseLog.text=Show Case &Log
AutoIngestControlPanel.bnDeleteCase.toolTipText=Delete the selected Case in its entirety
AutoIngestControlPanel.bnDeleteCase.text=&Delete Case
AutoIngestControlPanel.bnCancelJob.toolTipText=Cancel processing of the current Job and move on to the next Job. This functionality is only available for jobs running on current AIM node.
AutoIngestControlPanel.bnCancelJob.text=&Cancel Job
AutoIngestControlPanel.completedTable.toolTipText=The Completed table shows all Jobs that have been processed already
AutoIngestControlPanel.runningTable.toolTipText=The Running table displays the currently running Job and information about it
AutoIngestControlPanel.pendingTable.toolTipText=The Pending table displays the order upcoming Jobs will be processed with the top of the list first
AutoIngestControlPanel.bnPrioritizeCase.toolTipText=Move all images associated with a case to top of Pending queue.
AutoIngestControlPanel.bnPrioritizeCase.text=Prioriti&ze Case
AutoIngestControlPanel.bnPause.toolTipText=Suspend processing of Pending Jobs
AutoIngestControlPanel.bnPause.text=Pause
AutoIngestControlPanel.bnShowProgress.toolTipText=Show the progress of the currently running Job. This functionality is only available for jobs running on current AIM node.
AutoIngestControlPanel.bnShowProgress.text=Ingest Progress
AutoIngestControlPanel.bnOptions.toolTipText=Display options panel. All processing must be paused to open the options panel.
AutoIngestControlPanel.bnOptions.text=&Options
AutoIngestControlPanel.bnExit.toolTipText=Exit Application
AutoIngestControlPanel.bnExit.text=&Exit
AutoIngestControlPanel.bnCancelModule.toolTipText=Cancel processing of the current module within the Job and move on to the next module within the Job. This functionality is only available for jobs running on current AIM node.
AutoIngestControlPanel.bnCancelModule.text=Cancel &Module
AutoIngestControlPanel.bnRefresh.toolTipText=Refresh displayed tables
AutoIngestControlPanel.bnRefresh.text=&Refresh
AutoIngestControlPanel.lbCompleted.text=Completed Jobs
AutoIngestControlPanel.lbRunning.text=Running Jobs
AutoIngestControlPanel.lbPending.text=Pending Jobs
AutoIngestControlPanel.bnReprocessJob.text=Reprocess Job
AutoIngestControlPanel.bnOpenLogDir.text=Open System Logs Directory
AutoIngestControlPanel.tbServicesStatusMessage.text=
AutoIngestControlPanel.lbServicesStatus.text=Services Status:
AutoIngestControlPanel.bnPrioritizeJob.actionCommand=<AutoIngestDashboard.bnPrioritizeJob.text>
AutoIngestControlPanel.bnPrioritizeJob.toolTipText=Move this folder to the top of the Pending queue.
AutoIngestControlPanel.bnPrioritizeJob.text=Prioritize Job
<<<<<<< HEAD
AutoIngestControlPanel.lbStatus.text=Status:
AutoIngestControlPanel.PauseDueToSystemError=Paused due to system error, please consult the auto ingest system log
AutoIngestDashboard.prioritizeButton.toolTipText=Prioritizes the selected job AutoIngestDashboard.prioritizeButton.toolTipText=Prioritizes the selected job
AutoIngestDashboard.prioritizeButton.text=&Prioritize AutoIngestDashboard.prioritizeButton.text=&Prioritize
AutoIngestDashboard.refreshButton.toolTipText=Refresh displayed tables AutoIngestDashboard.refreshButton.toolTipText=Refresh displayed tables
AutoIngestDashboard.refreshButton.text=&Refresh AutoIngestDashboard.refreshButton.text=&Refresh
=======
AutoIngestControlPanel.lbStatus.text=Status:
>>>>>>> upstream/develop

4
branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
View File

@ -1,5 +1,5 @@
#Updated by build script #Updated by build script
#Thu, 22 Jun 2017 08:50:21 -0400 #Thu, 07 Sep 2017 13:53:53 -0400
LBL_splash_window_title=Starting Autopsy LBL_splash_window_title=Starting Autopsy
SPLASH_HEIGHT=314 SPLASH_HEIGHT=314
SPLASH_WIDTH=538 SPLASH_WIDTH=538
@ -8,4 +8,4 @@ SplashRunningTextBounds=0,289,538,18
SplashRunningTextColor=0x0 SplashRunningTextColor=0x0
SplashRunningTextFontSize=19 SplashRunningTextFontSize=19
currentVersion=Autopsy 4.4.1 currentVersion=Autopsy 4.4.2

6
branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
View File

@ -1,4 +1,4 @@
#Updated by build script #Updated by build script
#Thu, 22 Jun 2017 08:50:21 -0400 #Thu, 07 Sep 2017 13:53:53 -0400
CTL_MainWindow_Title=Autopsy 4.4.1 CTL_MainWindow_Title=Autopsy 4.4.2
CTL_MainWindow_Title_No_Project=Autopsy 4.4.1 CTL_MainWindow_Title_No_Project=Autopsy 4.4.2