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

Merge remote-tracking branch 'upstream/custom-release-2.11.0' into 3435_InvalidPath

Browse Source
This commit is contained in:
U-BASIS\dgrove 2018-01-08 12:36:40 -05:00
commit 475f624958
3 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
/* /*
* Autopsy Forensic Browser * Autopsy Forensic Browser
* *
* Copyright 2015-2017 Basis Technology Corp. * Copyright 2015-2018 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");
@ -1849,11 +1849,7 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
}//GEN-LAST:event_bnReprocessJobActionPerformed }//GEN-LAST:event_bnReprocessJobActionPerformed
private void bnClusterMetricsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnClusterMetricsActionPerformed private void bnClusterMetricsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnClusterMetricsActionPerformed
try {
new AutoIngestMetricsDialog(this.getTopLevelAncestor()); new AutoIngestMetricsDialog(this.getTopLevelAncestor());
} catch (AutoIngestMetricsDialog.AutoIngestMetricsDialogException ex) {
MessageNotifyUtil.Message.error(ex.getMessage());
}
}//GEN-LAST:event_bnClusterMetricsActionPerformed }//GEN-LAST:event_bnClusterMetricsActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables

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

@ -1,7 +1,7 @@
/* /*
* Autopsy Forensic Browser * Autopsy Forensic Browser
* *
* Copyright 2011-2017 Basis Technology Corp. * Copyright 2011-2018 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");
@ -77,7 +77,7 @@ 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 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;
@ -159,7 +159,7 @@ final class AutoIngestDashboard extends JPanel implements Observer {
serviceStatus = NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.tbServicesStatusMessage.Message.Down"); serviceStatus = NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.tbServicesStatusMessage.Message.Down");
} }
} catch (ServicesMonitor.ServicesMonitorException ex) { } catch (ServicesMonitor.ServicesMonitorException ex) {
logger.log(Level.SEVERE, String.format("Dashboard error getting service status for %s", service), ex); LOGGER.log(Level.SEVERE, String.format("Dashboard error getting service status for %s", service), ex);
} }
return serviceStatus; return serviceStatus;
} }
@ -470,7 +470,7 @@ final class AutoIngestDashboard extends JPanel implements Observer {
} }
setSelectedEntry(table, tableModel, currentRow); setSelectedEntry(table, tableModel, currentRow);
} catch (Exception ex) { } catch (Exception ex) {
logger.log(Level.SEVERE, "Error refreshing table " + table.toString(), ex); LOGGER.log(Level.SEVERE, "Error refreshing table " + table.toString(), ex);
} }
} }
@ -848,7 +848,7 @@ final class AutoIngestDashboard extends JPanel implements Observer {
refreshTables(jobsSnapshot); refreshTables(jobsSnapshot);
} catch (AutoIngestMonitor.AutoIngestMonitorException ex) { } catch (AutoIngestMonitor.AutoIngestMonitorException ex) {
String errorMessage = String.format(NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.PrioritizeJobError"), job.getManifest().getFilePath()); String errorMessage = String.format(NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.PrioritizeJobError"), job.getManifest().getFilePath());
logger.log(Level.SEVERE, errorMessage, ex); LOGGER.log(Level.SEVERE, errorMessage, ex);
MessageNotifyUtil.Message.error(errorMessage); MessageNotifyUtil.Message.error(errorMessage);
} }
setCursor(Cursor.getDefaultCursor()); setCursor(Cursor.getDefaultCursor());
@ -868,7 +868,7 @@ final class AutoIngestDashboard extends JPanel implements Observer {
refreshTables(jobsSnapshot); refreshTables(jobsSnapshot);
} catch (AutoIngestMonitor.AutoIngestMonitorException ex) { } catch (AutoIngestMonitor.AutoIngestMonitorException ex) {
String errorMessage = String.format(NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.PrioritizeCaseError"), caseName); String errorMessage = String.format(NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.PrioritizeCaseError"), caseName);
logger.log(Level.SEVERE, errorMessage, ex); LOGGER.log(Level.SEVERE, errorMessage, ex);
MessageNotifyUtil.Message.error(errorMessage); MessageNotifyUtil.Message.error(errorMessage);
} }
setCursor(Cursor.getDefaultCursor()); setCursor(Cursor.getDefaultCursor());
@ -876,11 +876,7 @@ final class AutoIngestDashboard extends JPanel implements Observer {
}//GEN-LAST:event_prioritizeCaseButtonActionPerformed }//GEN-LAST:event_prioritizeCaseButtonActionPerformed
private void clusterMetricsButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_clusterMetricsButtonActionPerformed private void clusterMetricsButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_clusterMetricsButtonActionPerformed
try {
new AutoIngestMetricsDialog(this.getTopLevelAncestor()); new AutoIngestMetricsDialog(this.getTopLevelAncestor());
} catch (AutoIngestMetricsDialog.AutoIngestMetricsDialogException ex) {
MessageNotifyUtil.Message.error(ex.getMessage());
}
}//GEN-LAST:event_clusterMetricsButtonActionPerformed }//GEN-LAST:event_clusterMetricsButtonActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables

33
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestMetricsDialog.java
View File

@ -1,7 +1,7 @@
/* /*
* Autopsy Forensic Browser * Autopsy Forensic Browser
* *
* Copyright 2017 Basis Technology Corp. * Copyright 2017-2018 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");
@ -27,6 +27,7 @@ import java.time.ZoneOffset;
import java.util.List; import java.util.List;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
import org.openide.util.NbBundle.Messages; import org.openide.util.NbBundle.Messages;
import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
import org.sleuthkit.autopsy.experimental.autoingest.AutoIngestMetricsCollector.JobMetric; import org.sleuthkit.autopsy.experimental.autoingest.AutoIngestMetricsCollector.JobMetric;
/** /**
@ -36,10 +37,10 @@ final class AutoIngestMetricsDialog extends javax.swing.JDialog {
private static final int GIGABYTE_SIZE = 1073741824; private static final int GIGABYTE_SIZE = 1073741824;
private final AutoIngestMetricsCollector autoIngestMetricsCollector; private AutoIngestMetricsCollector autoIngestMetricsCollector;
/** /**
* Creates an instance of AutoIngestMetricsDialog * Creates an instance of AutoIngestMetricsDialog.
* *
* @param parent The parent container. * @param parent The parent container.
*/ */
@ -47,29 +48,37 @@ final class AutoIngestMetricsDialog extends javax.swing.JDialog {
"AutoIngestMetricsDialog.title.text=Auto Ingest Metrics", "AutoIngestMetricsDialog.title.text=Auto Ingest Metrics",
"AutoIngestMetricsDialog.initReportText=Select a date above and click the 'Generate Metrics Report' button to generate\na metrics report." "AutoIngestMetricsDialog.initReportText=Select a date above and click the 'Generate Metrics Report' button to generate\na metrics report."
}) })
AutoIngestMetricsDialog(Container parent) throws AutoIngestMetricsDialogException { AutoIngestMetricsDialog(Container parent) {
super((Window) parent, NbBundle.getMessage(AutoIngestMetricsDialog.class, "AutoIngestMetricsDialog.title.text"), ModalityType.MODELESS); super((Window) parent, NbBundle.getMessage(AutoIngestMetricsDialog.class, "AutoIngestMetricsDialog.title.text"), ModalityType.MODELESS);
try {
autoIngestMetricsCollector = new AutoIngestMetricsCollector();
} catch (AutoIngestMetricsCollector.AutoIngestMetricsCollectorException ex) {
throw new AutoIngestMetricsDialogException("Error starting up the auto ingest metrics dialog.", ex);
}
initComponents(); initComponents();
reportTextArea.setText(NbBundle.getMessage(AutoIngestMetricsDialog.class, "AutoIngestMetricsDialog.initReportText")); reportTextArea.setText(NbBundle.getMessage(AutoIngestMetricsDialog.class, "AutoIngestMetricsDialog.initReportText"));
setModal(true); setModal(true);
setSize(getPreferredSize()); setSize(getPreferredSize());
setLocationRelativeTo(parent); setLocationRelativeTo(parent);
setAlwaysOnTop(false);
setVisible(true); setVisible(true);
} }
/** /**
* Update the metrics shown in the report text area. * Update the metrics shown in the report text area.
*
* @throws AutoIngestMetricsDialogException When the initialization of the
* AutoIngestMetricsCollector
* fails.
*/ */
private void updateMetrics() { private void updateMetrics() throws AutoIngestMetricsDialogException {
if (datePicker.getDate() == null) { if (datePicker.getDate() == null) {
return; return;
} }
if(autoIngestMetricsCollector == null) {
try {
autoIngestMetricsCollector = new AutoIngestMetricsCollector();
} catch (AutoIngestMetricsCollector.AutoIngestMetricsCollectorException ex) {
throw new AutoIngestMetricsDialogException("Error initializing the auto ingest metrics collector.", ex);
}
}
AutoIngestMetricsCollector.MetricsSnapshot metricsSnapshot = autoIngestMetricsCollector.queryCoordinationServiceForMetrics(); AutoIngestMetricsCollector.MetricsSnapshot metricsSnapshot = autoIngestMetricsCollector.queryCoordinationServiceForMetrics();
List<JobMetric> completedJobMetrics = metricsSnapshot.getCompletedJobMetrics(); List<JobMetric> completedJobMetrics = metricsSnapshot.getCompletedJobMetrics();
int jobsCompleted = 0; int jobsCompleted = 0;
@ -214,7 +223,11 @@ final class AutoIngestMetricsDialog extends javax.swing.JDialog {
private void metricsButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_metricsButtonActionPerformed private void metricsButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_metricsButtonActionPerformed
setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
try {
updateMetrics(); updateMetrics();
} catch (AutoIngestMetricsDialogException ex) {
MessageNotifyUtil.Message.error(ex.getMessage());
}
setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
}//GEN-LAST:event_metricsButtonActionPerformed }//GEN-LAST:event_metricsButtonActionPerformed