From ecf81085614605cc594837df1d65decdd00b545a Mon Sep 17 00:00:00 2001 From: Ann Priestman Date: Thu, 12 Oct 2017 12:43:02 -0400 Subject: [PATCH] Renaming --- .../AddContentToHashDbAction.java | 2 +- .../HashDbCreateDatabaseDialog.java | 2 +- .../HashDbImportDatabaseDialog.java | 2 +- .../hashdatabase/HashDbIngestModule.java | 4 +- .../modules/hashdatabase/HashDbManager.java | 66 +++++++++++++++---- .../hashdatabase/HashLookupModuleFactory.java | 2 +- .../HashLookupModuleSettings.java | 3 +- .../HashLookupModuleSettingsPanel.java | 8 +-- .../hashdatabase/HashLookupSettings.java | 16 +---- .../hashdatabase/HashLookupSettingsPanel.java | 6 +- .../AddTaggedHashesToHashDbConfigPanel.java | 2 +- .../configuration/SharedConfiguration.java | 4 +- 12 files changed, 73 insertions(+), 44 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/AddContentToHashDbAction.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/AddContentToHashDbAction.java index 8c9df922bf..6c58402fd6 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/AddContentToHashDbAction.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/AddContentToHashDbAction.java @@ -106,7 +106,7 @@ final class AddContentToHashDbAction extends AbstractAction implements Presenter // Get the current set of updateable hash databases and add each // one to the menu as a separate menu item. Selecting a hash database // adds the selected files to the selected database. - final List hashDatabases = HashDbManager.getInstance().getUpdateableHashSetsNew(); + final List hashDatabases = HashDbManager.getInstance().getUpdateableHashDatabases(); if (!hashDatabases.isEmpty()) { for (final HashDatabase database : hashDatabases) { JMenuItem databaseItem = add(database.getHashSetName()); diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbCreateDatabaseDialog.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbCreateDatabaseDialog.java index 0bea515d14..ab3efb8afb 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbCreateDatabaseDialog.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbCreateDatabaseDialog.java @@ -338,7 +338,7 @@ final class HashDbCreateDatabaseDialog extends javax.swing.JDialog { String errorMessage = NbBundle .getMessage(this.getClass(), "HashDbCreateDatabaseDialog.errMsg.hashDbCreationErr"); try { - newHashDb = HashDbManager.getInstance().addNewHashDatabaseNoSave(hashSetNameTextField.getText(), fileChooser.getSelectedFile().getCanonicalPath(), true, sendIngestMessagesCheckbox.isSelected(), type); + newHashDb = HashDbManager.getInstance().addNewFileTypeHashDatabase(hashSetNameTextField.getText(), fileChooser.getSelectedFile().getCanonicalPath(), true, sendIngestMessagesCheckbox.isSelected(), type); } catch (IOException ex) { Logger.getLogger(HashDbCreateDatabaseDialog.class.getName()).log(Level.WARNING, errorMessage, ex); JOptionPane.showMessageDialog(this, diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbImportDatabaseDialog.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbImportDatabaseDialog.java index a533babaea..f440b4e9ac 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbImportDatabaseDialog.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbImportDatabaseDialog.java @@ -341,7 +341,7 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog { "HashDbImportDatabaseDialog.errorMessage.failedToOpenHashDbMsg", selectedFilePath); try { - selectedHashDb = HashDbManager.getInstance().addExistingHashDatabaseNoSave(hashSetNameTextField.getText(), selectedFilePath, true, sendIngestMessagesCheckbox.isSelected(), type); + selectedHashDb = HashDbManager.getInstance().addExistingFileTypeHashDatabase(hashSetNameTextField.getText(), selectedFilePath, true, sendIngestMessagesCheckbox.isSelected(), type); } catch (HashDbManagerException ex) { Logger.getLogger(HashDbImportDatabaseDialog.class.getName()).log(Level.WARNING, errorMessage, ex); JOptionPane.showMessageDialog(this, diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbIngestModule.java index 6aa9729b07..55d91b5fbd 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbIngestModule.java @@ -96,8 +96,8 @@ public class HashDbIngestModule implements FileIngestModule { if (!hashDbManager.verifyAllDatabasesLoadedCorrectly()) { throw new IngestModuleException("Could not load all hash databases"); } - updateEnabledHashSets(hashDbManager.getKnownBadFileHashSetsNew(), knownBadHashSets); - updateEnabledHashSets(hashDbManager.getKnownFileHashSetsNew(), knownHashSets); + updateEnabledHashSets(hashDbManager.getNotableFileHashDatabases(), knownBadHashSets); + updateEnabledHashSets(hashDbManager.getKnownFileHashDatabases(), knownHashSets); if (refCounter.incrementAndGet(jobId) == 1) { // initialize job totals diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java index 85faaab82a..8403b2114a 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java @@ -58,8 +58,6 @@ public class HashDbManager implements PropertyChangeListener { private static final String HASH_DATABASE_FILE_EXTENSON = "kdb"; //NON-NLS private static HashDbManager instance = null; - //private List knownHashSets = new ArrayList<>(); - //private List knownBadHashSets = new ArrayList<>(); private List hashSets = new ArrayList<>(); private Set hashSetNames = new HashSet<>(); private Set hashSetPaths = new HashSet<>(); @@ -146,6 +144,7 @@ public class HashDbManager implements PropertyChangeListener { * * @throws HashDbManagerException */ + @Deprecated public synchronized HashDb addExistingHashDatabase(String hashSetName, String path, boolean searchDuringIngest, boolean sendIngestMessages, HashDb.KnownFilesType knownFilesType) throws HashDbManagerException { HashDb hashDb = null; hashDb = this.addExistingHashDatabaseNoSave(hashSetName, path, searchDuringIngest, sendIngestMessages, knownFilesType); @@ -153,7 +152,12 @@ public class HashDbManager implements PropertyChangeListener { return hashDb; } + @Deprecated synchronized HashDb addExistingHashDatabaseNoSave(String hashSetName, String path, boolean searchDuringIngest, boolean sendIngestMessages, HashDb.KnownFilesType knownFilesType) throws HashDbManagerException { + return (HashDb)addExistingFileTypeHashDatabase(hashSetName, path, searchDuringIngest, sendIngestMessages, knownFilesType); + } + + synchronized HashDatabase addExistingFileTypeHashDatabase(String hashSetName, String path, boolean searchDuringIngest, boolean sendIngestMessages, HashDb.KnownFilesType knownFilesType) throws HashDbManagerException { HashDb hashDb = null; try { if (!new File(path).exists()) { @@ -193,6 +197,7 @@ public class HashDbManager implements PropertyChangeListener { * * @throws HashDbManagerException */ + @Deprecated public synchronized HashDb addNewHashDatabase(String hashSetName, String path, boolean searchDuringIngest, boolean sendIngestMessages, HashDb.KnownFilesType knownFilesType) throws HashDbManagerException { @@ -204,8 +209,14 @@ public class HashDbManager implements PropertyChangeListener { return hashDb; } + @Deprecated public synchronized HashDb addNewHashDatabaseNoSave(String hashSetName, String path, boolean searchDuringIngest, boolean sendIngestMessages, HashDb.KnownFilesType knownFilesType) throws HashDbManagerException { + return (HashDb)addNewFileTypeHashDatabase(hashSetName, path, searchDuringIngest, sendIngestMessages, knownFilesType); + } + + public synchronized HashDatabase addNewFileTypeHashDatabase(String hashSetName, String path, boolean searchDuringIngest, boolean sendIngestMessages, + HashDb.KnownFilesType knownFilesType) throws HashDbManagerException { HashDb hashDb = null; try { File file = new File(path); @@ -241,7 +252,7 @@ public class HashDbManager implements PropertyChangeListener { } throw new TskCoreException("Invalid database type in HashDbInfo"); } - + private HashDb addFileTypeHashDatabase(int handle, String hashSetName, boolean searchDuringIngest, boolean sendIngestMessages, HashDb.KnownFilesType knownFilesType) throws TskCoreException { // Wrap an object around the handle. HashDb hashDb = new HashDb(handle, hashSetName, searchDuringIngest, sendIngestMessages, knownFilesType); @@ -308,16 +319,11 @@ public class HashDbManager implements PropertyChangeListener { * * @throws HashDbManagerException */ - public synchronized void removeHashDatabase(HashDb hashDb) throws HashDbManagerException { + public synchronized void removeHashDatabase(HashDatabase hashDb) throws HashDbManagerException { this.removeHashDatabaseNoSave(hashDb); this.save(); } - // public synchronized void removeHashDatabaseNoSave(HashDb hashDb) throws HashDbManagerException { - // removeHashDatabaseNoSave((UnnamedHashSet)hashDb); - // - // } - public synchronized void removeHashDatabaseNoSave(HashDatabase hashDb) throws HashDbManagerException { // Don't remove a database if ingest is running boolean ingestIsRunning = IngestManager.getInstance().isIngestRunning(); @@ -386,14 +392,30 @@ public class HashDbManager implements PropertyChangeListener { */ @Deprecated public synchronized List getAllHashSets() { + return getAllFileTypeHashSets(); + } + + /** + * Gets all of the file type hash databases used to classify files as known or known + * bad. + * + * @return A list, possibly empty, of hash databases. + */ + public synchronized List getAllFileTypeHashSets() { List hashDbs = new ArrayList<>(); this.hashSets.stream().filter((thisSet) -> (thisSet instanceof HashDb)).forEach((thisSet) -> { hashDbs.add((HashDb)thisSet); }); return hashDbs; - } + } - public synchronized List getAllHashSetsNew(){ + /** + * Gets all of the hash databases used to classify files as known or known + * bad. + * + * @return A list, possibly empty, of hash databases. + */ + public synchronized List getAllHashDatabases(){ List hashDbs = new ArrayList<>(); hashDbs.addAll(this.hashSets); return hashDbs; @@ -413,7 +435,12 @@ public class HashDbManager implements PropertyChangeListener { return hashDbs; } - public synchronized List getKnownFileHashSetsNew() { + /** + * Gets all of the hash databases used to classify files as known. + * + * @return A list, possibly empty, of hash databases. + */ + public synchronized List getKnownFileHashDatabases() { List hashDbs = new ArrayList<>(); this.hashSets.stream().filter((db) -> (db.getKnownFilesType() == HashDb.KnownFilesType.KNOWN)).forEach((db) -> { hashDbs.add(db); @@ -435,7 +462,12 @@ public class HashDbManager implements PropertyChangeListener { return hashDbs; } - public synchronized List getKnownBadFileHashSetsNew() { + /** + * Gets all of the hash databases used to classify files as notable. + * + * @return A list, possibly empty, of hash databases. + */ + public synchronized List getNotableFileHashDatabases() { List hashDbs = new ArrayList<>(); this.hashSets.stream().filter((db) -> (db.getKnownFilesType() == HashDb.KnownFilesType.KNOWN_BAD)).forEach((db) -> { hashDbs.add(db); @@ -458,7 +490,12 @@ public class HashDbManager implements PropertyChangeListener { return updateableDbs; } - public synchronized List getUpdateableHashSetsNew(){ + /** + * Gets all of the hash databases that accept updates. + * + * @return A list, possibly empty, of hash databases. + */ + public synchronized List getUpdateableHashDatabases(){ return getUpdateableHashSets(this.hashSets); } @@ -684,6 +721,7 @@ public class HashDbManager implements PropertyChangeListener { void close() throws TskCoreException; + @Override public String toString(); DatabaseType getDatabaseType(); diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleFactory.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleFactory.java index 4e06f2805b..52ae48c8cd 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleFactory.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleFactory.java @@ -60,7 +60,7 @@ public class HashLookupModuleFactory extends IngestModuleFactoryAdapter { @Override public IngestModuleIngestJobSettings getDefaultIngestJobSettings() { // All available hash sets are enabled and always calculate hashes is true by default. - return new HashLookupModuleSettings(true, HashDbManager.getInstance().getAllHashSetsNew()); + return new HashLookupModuleSettings(true, HashDbManager.getInstance().getAllHashDatabases()); } @Override diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleSettings.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleSettings.java index 3b2de9ed7b..49f45a57d8 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleSettings.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleSettings.java @@ -55,6 +55,7 @@ final class HashLookupModuleSettings implements IngestModuleIngestJobSettings { /** * This overrides the default deserialization code so we can * copy the enabled/disabled status into the DatabaseType objects. + * Ignore the Netbeans warning that this method is unused. * @param stream * @throws IOException * @throws ClassNotFoundException @@ -149,7 +150,7 @@ final class HashLookupModuleSettings implements IngestModuleIngestJobSettings { } try{ - databaseInfoList = HashLookupSettings.convertHashSetList(HashDbManager.getInstance().getAllHashSetsNew()); + databaseInfoList = HashLookupSettings.convertHashSetList(HashDbManager.getInstance().getAllHashDatabases()); } catch (HashLookupSettings.HashLookupSettingsException ex){ Logger.getLogger(HashLookupModuleSettings.class.getName()).log(Level.SEVERE, "Error updating hash database settings.", ex); //NON-NLS return; diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleSettingsPanel.java index 279a9796a1..ae2e4e7331 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleSettingsPanel.java @@ -53,8 +53,8 @@ public final class HashLookupModuleSettingsPanel extends IngestModuleIngestJobSe } private void initializeHashSetModels(HashLookupModuleSettings settings) { - initializeHashSetModels(settings, hashDbManager.getKnownFileHashSetsNew(), knownHashSetModels); - initializeHashSetModels(settings, hashDbManager.getKnownBadFileHashSetsNew(), knownBadHashSetModels); + initializeHashSetModels(settings, hashDbManager.getKnownFileHashDatabases(), knownHashSetModels); + initializeHashSetModels(settings, hashDbManager.getNotableFileHashDatabases(), knownBadHashSetModels); } private void initializeHashSetModels(HashLookupModuleSettings settings, List hashDbs, List hashSetModels) { @@ -125,8 +125,8 @@ public final class HashLookupModuleSettingsPanel extends IngestModuleIngestJobSe } private void updateHashSetModels() { - updateHashSetModels(hashDbManager.getKnownFileHashSetsNew(), knownHashSetModels); - updateHashSetModels(hashDbManager.getKnownBadFileHashSetsNew(), knownBadHashSetModels); + updateHashSetModels(hashDbManager.getKnownFileHashDatabases(), knownHashSetModels); + updateHashSetModels(hashDbManager.getNotableFileHashDatabases(), knownBadHashSetModels); } void updateHashSetModels(List hashDbs, List hashSetModels) { diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettings.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettings.java index 2efba5eee1..8e9adbf00a 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettings.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettings.java @@ -279,14 +279,6 @@ final class HashLookupSettings implements Serializable { * @return Whether or not the settings were written successfully */ static boolean writeSettings(HashLookupSettings settings) { - - System.out.println("\n#####\nwriteSettings"); - for(HashDbInfo info:settings.hashDbInfoList){ - System.out.println(info.hashSetName); - System.out.println(" DB type: " + info.dbType.toString()); - System.out.println(" Enabled: " + info.searchDuringIngest); - System.out.println(" Type: " + info.knownFilesType.getDisplayName()); - } try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(SERIALIZATION_FILE_PATH))) { out.writeObject(settings); @@ -457,9 +449,8 @@ final class HashLookupSettings implements Serializable { // FILE types will always have unique names, so no more testing required return true; } - - // TODO TODO central repo check - return true; + // To do: central repo tests + return false; } @@ -506,8 +497,7 @@ final class HashLookupSettings implements Serializable { /** * This overrides the default deserialization code so we can - * properly set the dbType enum and other new fields - * given an old settings file. + * properly set the dbType enum given an old settings file. * @param stream * @throws IOException * @throws ClassNotFoundException diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java index e28a1d5224..d18fe9e0ad 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java @@ -259,7 +259,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan public void saveSettings() { //Checking for for any unindexed databases List unindexed = new ArrayList<>(); - for (HashDatabase hashSet : hashSetManager.getAllHashSetsNew()) { + for (HashDatabase hashSet : hashSetManager.getAllHashDatabases()) { try { if (!hashSet.hasIndex()) { unindexed.add(hashSet); @@ -408,7 +408,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan */ private class HashSetTableModel extends AbstractTableModel { - List hashSets = HashDbManager.getInstance().getAllHashSetsNew(); + List hashSets = HashDbManager.getInstance().getAllHashDatabases(); @Override public int getColumnCount() { @@ -483,7 +483,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan } void refreshModel() { - hashSets = HashDbManager.getInstance().getAllHashSetsNew(); + hashSets = HashDbManager.getInstance().getAllHashDatabases(); refreshDisplay(); } diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java index cca3271760..4dea291734 100755 --- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java +++ b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java @@ -105,7 +105,7 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel { // Get the updateable hash databases and add their hash set names to the // JComboBox component. - List updateableHashSets = HashDbManager.getInstance().getUpdateableHashSetsNew(); + List updateableHashSets = HashDbManager.getInstance().getUpdateableHashDatabases(); if (!updateableHashSets.isEmpty()) { for (HashDatabase hashDb : updateableHashSets) { hashSetsComboBox.addItem(hashDb); diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java index ccb2e49e54..b715b7d309 100755 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java @@ -1016,7 +1016,7 @@ public class SharedConfiguration { // If a copy of the database is loaded, close it before deleting and copying. if (localDb.exists()) { - List hashDbs = HashDbManager.getInstance().getAllHashSets(); + List hashDbs = HashDbManager.getInstance().getAllFileTypeHashSets(); HashDbManager.HashDb matchingDb = null; for (HashDbManager.HashDb db : hashDbs) { try { @@ -1122,7 +1122,7 @@ public class SharedConfiguration { try { HashDbManager hashDbManager = HashDbManager.getInstance(); hashDbManager.loadLastSavedConfiguration(); - for (HashDb hashDb : hashDbManager.getAllHashSets()) { + for (HashDb hashDb : hashDbManager.getAllFileTypeHashSets()) { if (hashDb.hasIndexOnly()) { results.add(hashDb.getIndexPath()); } else {