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

2955 remove nsrl from list if they attempt to index, adjust messages

Browse Source
This commit is contained in:
William Schaefer 2019-06-17 14:36:45 -04:00
parent 4000be9436
commit 98feb3137a
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties-MERGED
View File

@ -26,8 +26,7 @@ HashDbSearchAction.noOpenCase.errMsg=No open case available.
HashDbSearchPanel.noOpenCase.errMsg=No open case available.
HashLookupSettingsPanel.centralRepo=Central Repository
HashLookupSettingsPanel.editable=Editable
# {0} - nsrlUrl
HashLookupSettingsPanel.indexNsrl.text=This hash set appears to be the NSRL, instead of indexing the NSRL please download an already indexed version available here: {0}
HashLookupSettingsPanel.indexNsrl.text=This hash set appears to be the NSRL, it will be removed from the list.\n
HashLookupSettingsPanel.indexNsrl.title=NSRL will not be indexed
HashLookupSettingsPanel.notApplicable=N/A
HashLookupSettingsPanel.promptMessage.deleteHashDb=This will make the hash database unavailable for lookup. Do you want to proceed?\n\nNote: The hash database can still be re-imported later.
@ -36,14 +35,15 @@ HashLookupSettingsPanel.readOnly=Read only
# {0} - hash lookup name
HashLookupSettingsPanel.removeDatabaseFailure.message=Failed to remove hash lookup: {0}
# {0} - nsrlUrlAddress
# {1} - nsrlHashSets
HashLookupSettingsPanel.removeUnindexedNsrl.text=instead of indexing the NSRL please download an already indexed version available here: {0}\n\nHash set(s):{1}
HashLookupSettingsPanel.removeUnindexedNsrl.text=Instead of indexing the NSRL, please download an already indexed version available here:\n{0}
HashLookupSettingsPanel.removeUnindexedNsrl.title=Unindexed NSRL(s) will be removed
HashLookupSettingsPanel.saveFail.message=Couldn't save hash set settings.
HashLookupSettingsPanel.saveFail.title=Save Fail
HashLookupSettingsPanel.Title=Global Hash Lookup Settings
HashLookupSettingsPanel.unindexedNsrl.base=The following hash set appears to be an unindexed version of the NSRL it will be removed,
HashLookupSettingsPanel.unindexedNsrls.base=The following hash sets appear to be unindexed versions of the NSRL they will be removed,
# {0} - nsrlHashSet
HashLookupSettingsPanel.unindexedNsrl.base=The following hash set appears to be an unindexed version of the NSRL, it will be removed from the list.\nHash set:{0}\n
# {0} - nsrlHashSets
HashLookupSettingsPanel.unindexedNsrls.base=The following hash sets appear to be unindexed versions of the NSRL, they will be removed from the list.\nHash sets:{0}\n
HashLookupSettingsPanel.updateStatusError=Error reading status
ImportCentralRepoDbProgressDialog.errorParsingFile.message=Error parsing hash set file
ImportCentralRepoDbProgressDialog.linesProcessed.message=\ hashes processed

30
Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java
View File

@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
* Copyright 2011-2018 Basis Technology Corp.
* Copyright 2011-2019 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@ -25,7 +25,6 @@ import java.awt.Frame;
import java.awt.event.KeyEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
@ -69,6 +68,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
.getMessage(HashLookupSettingsPanel.class, "HashDbConfigPanel.errorGettingPathText");
private static final String ERROR_GETTING_INDEX_STATUS_TEXT = NbBundle
.getMessage(HashLookupSettingsPanel.class, "HashDbConfigPanel.errorGettingIndexStatusText");
private static final Logger logger = Logger.getLogger(HashLookupSettingsPanel.class.getName());
private final HashDbManager hashSetManager = HashDbManager.getInstance();
private final HashSetTableModel hashSetTableModel = new HashSetTableModel();
private final List<Integer> newReferenceSetIDs = new ArrayList<>();
@ -395,10 +395,11 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
* @param unindexed The list of unindexed databases. Can be of size 1.
*/
@NbBundle.Messages({"# {0} - nsrlUrlAddress",
"# {1} - nsrlHashSets",
"HashLookupSettingsPanel.removeUnindexedNsrl.text=instead of indexing the NSRL please download an already indexed version available here: {0}\n\nHash set(s):{1}",
"HashLookupSettingsPanel.unindexedNsrl.base=The following hash set appears to be an unindexed version of the NSRL it will be removed, ",
"HashLookupSettingsPanel.unindexedNsrls.base=The following hash sets appear to be unindexed versions of the NSRL they will be removed, ",
"HashLookupSettingsPanel.removeUnindexedNsrl.text=Instead of indexing the NSRL, please download an already indexed version available here:\n{0}",
"# {0} - nsrlHashSet",
"HashLookupSettingsPanel.unindexedNsrl.base=The following hash set appears to be an unindexed version of the NSRL, it will be removed from the list.\nHash set:{0}\n",
"# {0} - nsrlHashSets",
"HashLookupSettingsPanel.unindexedNsrls.base=The following hash sets appear to be unindexed versions of the NSRL, they will be removed from the list.\nHash sets:{0}\n",
"HashLookupSettingsPanel.removeUnindexedNsrl.title=Unindexed NSRL(s) will be removed"})
private void showInvalidIndex(List<SleuthkitHashSet> unindexed) {
String total = "";
@ -417,9 +418,9 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
if (!nsrlHashsets.isEmpty()) {
String message;
if (nsrlHashsets.size() > 1) {
message = Bundle.HashLookupSettingsPanel_unindexedNsrls_base() + Bundle.HashLookupSettingsPanel_removeUnindexedNsrl_text(NSRL_URL, nsrlTotal);
message = Bundle.HashLookupSettingsPanel_unindexedNsrls_base(nsrlTotal) + Bundle.HashLookupSettingsPanel_removeUnindexedNsrl_text(NSRL_URL);
} else {
message = Bundle.HashLookupSettingsPanel_unindexedNsrl_base() + Bundle.HashLookupSettingsPanel_removeUnindexedNsrl_text(NSRL_URL, nsrlTotal);
message = Bundle.HashLookupSettingsPanel_unindexedNsrl_base(nsrlTotal) + Bundle.HashLookupSettingsPanel_removeUnindexedNsrl_text(NSRL_URL);
}
JOptionPane.showMessageDialog(this, message, Bundle.HashLookupSettingsPanel_removeUnindexedNsrl_title(), JOptionPane.INFORMATION_MESSAGE);
for (SleuthkitHashSet hdb : nsrlHashsets) {
@ -975,8 +976,8 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}
}//GEN-LAST:event_sendIngestMessagesCheckBoxActionPerformed
@NbBundle.Messages({"# {0} - nsrlUrl",
"HashLookupSettingsPanel.indexNsrl.text=This hash set appears to be the NSRL, instead of indexing the NSRL please download an already indexed version available here: {0}",
@NbBundle.Messages({"HashLookupSettingsPanel.indexNsrl.text=This hash set appears to be the NSRL, it will be removed from the list.\n",
"HashLookupSettingsPanel.indexNsrl.title=NSRL will not be indexed"})
private void indexButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_indexButtonActionPerformed
final HashDb hashDatabase = ((HashSetTable) hashSetTable).getSelection();
@ -987,7 +988,14 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
// the UI.
SleuthkitHashSet hashDb = (SleuthkitHashSet) hashDatabase;
if (hashDb.getHashSetName().toLowerCase().contains(NSRL_NAME_STRING)) {
JOptionPane.showMessageDialog(this, Bundle.HashLookupSettingsPanel_indexNsrl_text(NSRL_URL), Bundle.HashLookupSettingsPanel_indexNsrl_title(), JOptionPane.INFORMATION_MESSAGE);
JOptionPane.showMessageDialog(this, Bundle.HashLookupSettingsPanel_indexNsrl_text() + Bundle.HashLookupSettingsPanel_removeUnindexedNsrl_text(NSRL_URL), Bundle.HashLookupSettingsPanel_indexNsrl_title(), JOptionPane.INFORMATION_MESSAGE);
try {
hashSetManager.removeHashDatabaseNoSave(hashDatabase);
hashSetTableModel.refreshModel();
firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
} catch (HashDbManager.HashDbManagerException ex) {
logger.log(Level.WARNING, "Unable to remove unindexed NSRL from hash set list", ex);
}
} else {
hashDb.addPropertyChangeListener(new PropertyChangeListener() {
@Override