diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle.properties b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle.properties index 3ca1d76caf..d4753467fa 100644 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle.properties +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle.properties @@ -22,8 +22,8 @@ HashDbManagementPanel.hashDbNameLabel.text=No database selected HashDbManagementPanel.locationLabel.text=Location: HashDbManagementPanel.hashDbLocationLabel.text=No database selected HashDbManagementPanel.deleteButton.text=Delete -HashDbManagementPanel.useForIngestCheckbox.text=Use for Ingest -HashDbManagementPanel.showInboxMessagesCheckBox.text=Show Inbox Messages +HashDbManagementPanel.useForIngestCheckbox.text=Use for ingest +HashDbManagementPanel.showInboxMessagesCheckBox.text=Send messages during ingest HashDbManagementPanel.indexLabel.text=Index Status: HashDbManagementPanel.indexButton.text=Index HashDbManagementPanel.ingestRunningLabel.text= diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManagementPanel.form b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManagementPanel.form index 73f502c5f7..0e9e6c6b1c 100644 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManagementPanel.form +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManagementPanel.form @@ -178,7 +178,7 @@ - + diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManagementPanel.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManagementPanel.java index bc8ead47b1..76e9e2d38a 100644 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManagementPanel.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManagementPanel.java @@ -312,7 +312,7 @@ public class HashDbManagementPanel extends javax.swing.JPanel { .addComponent(useForIngestCheckbox) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(showInboxMessagesCheckBox) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 195, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 175, Short.MAX_VALUE) .addComponent(ingestRunningLabel) .addContainerGap()) ); @@ -357,7 +357,7 @@ public class HashDbManagementPanel extends javax.swing.JPanel { JOptionPane.showMessageDialog(this, new Object[]{"New Hash Set name:", nameTextField, nsrlCheckBox}, "New Hash Set", JOptionPane.PLAIN_MESSAGE); String setName = nameTextField.getText(); if (setName != null && !setName.equals("")) { - HashDb newDb = new HashDb(setName, Arrays.asList(new String[]{filePath}), false, false); + HashDb newDb = new HashDb(setName, Arrays.asList(new String[]{filePath}), true, !nsrlCheckBox.isSelected()); int toIndex = JOptionPane.NO_OPTION; if (IndexStatus.isIngestible(newDb.status())) { newDb.setUseForIngest(true); diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties index 10fd73991a..0cd5d83c56 100755 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties @@ -24,7 +24,7 @@ KeywordSearchEditListPanel.copyMenuItem.text=Copy KeywordSearchEditListPanel.exportButton.text=Export List KeywordSearchEditListPanel.deleteListButton.text=Delete List KeywordSearchListsManagementPanel.newListButton.text=New List -KeywordSearchEditListPanel.useForIngestCheckbox.text=Use during triage / ingest +KeywordSearchEditListPanel.useForIngestCheckbox.text=Use during ingest KeywordSearchListsManagementPanel.importButton.text=Import List KeywordSearchPanel.searchBox.text=Search... KeywordSearchPanel.regExCheckboxMenuItem.text=Use Regular Expressions @@ -48,7 +48,7 @@ ExtractedContentPanel.pageOfLabel.text=of ExtractedContentPanel.pageCurLabel.text=- ExtractedContentPanel.pageTotalLabel.text=- ExtractedContentPanel.hitLabel.toolTipText= -KeywordSearchEditListPanel.ingestMessagesCheckbox.text=Send messages during triage / ingest +KeywordSearchEditListPanel.ingestMessagesCheckbox.text=Send messages during ingest KeywordSearchEditListPanel.ingestMessagesCheckbox.toolTipText=Send messages during triage / ingest when hits on keyword from this list occur KeywordSearchConfigurationPanel2.skipNSRLCheckBox.text=Skip files in NSRL KeywordSearchConfigurationPanel2.skipNSRLCheckBox.toolTipText=Please make sure you have either selected to run or have previously run the Hash DB Ingest Service. diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.form index 1810159312..86c7fd21a6 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.form +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.form @@ -1,4 +1,4 @@ - +
@@ -62,10 +62,10 @@ - + - + @@ -98,23 +98,26 @@ - - - - - - - - + - + - - + + + + + + + + + + + + diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java index b5a02f3559..a69198ece5 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java @@ -411,21 +411,22 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec listEditorPanel.setLayout(listEditorPanelLayout); listEditorPanelLayout.setHorizontalGroup( listEditorPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, listEditorPanelLayout.createSequentialGroup() - .addContainerGap() - .addComponent(useForIngestCheckbox) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 62, Short.MAX_VALUE) - .addComponent(deleteWordButton) - .addContainerGap()) .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, listEditorPanelLayout.createSequentialGroup() - .addContainerGap(34, Short.MAX_VALUE) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(addKeywordPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(19, 19, 19)) .addGroup(listEditorPanelLayout.createSequentialGroup() .addContainerGap() - .addComponent(ingestMessagesCheckbox) - .addContainerGap(131, Short.MAX_VALUE)) + .addGroup(listEditorPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, listEditorPanelLayout.createSequentialGroup() + .addComponent(useForIngestCheckbox) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(deleteWordButton) + .addContainerGap()) + .addGroup(listEditorPanelLayout.createSequentialGroup() + .addComponent(ingestMessagesCheckbox) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) ); listEditorPanelLayout.setVerticalGroup( listEditorPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -467,10 +468,10 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jSeparator1, javax.swing.GroupLayout.DEFAULT_SIZE, 340, Short.MAX_VALUE) + .addComponent(jSeparator1) .addComponent(listEditorPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addContainerGap(81, Short.MAX_VALUE) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(exportButton) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(deleteListButton) diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestService.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestService.java index 9124d84ffb..65aa0a2629 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestService.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestService.java @@ -71,9 +71,14 @@ public final class RAImageIngestService implements IngestServiceImage { for(int i = 0; i < modules.size(); i++) { Extract module = modules.get(i); - module.process(image, controller); + try { + module.process(image, controller); + subCompleted.append(module.getName()).append(" complete
"); + } catch (Exception ex) { + logger.log(Level.WARNING, "Exception occurred in " + module.getName(), ex); + subCompleted.append(module.getName()).append(" failed - see log for details
"); + } controller.progress(i+1); - subCompleted.append(module.getName()).append(" complete
"); errors.addAll(module.getErrorMessages()); } }