knownHashSets) {
IngestJobTotals jobTotals = getTotalsForIngestJobs(jobId);
totalsForIngestJobs.remove(jobId);
@@ -384,8 +384,8 @@ public class HashDbIngestModule implements FileIngestModule {
detailsSb.append("") //NON-NLS
.append(NbBundle.getMessage(HashDbIngestModule.class, "HashDbIngestModule.complete.databasesUsed"))
.append("
\n"); //NON-NLS
- for (HashDatabase db : knownBadHashSets) {
- detailsSb.append("- ").append(db.getDisplayName()).append("
\n"); //NON-NLS
+ for (HashDb db : knownBadHashSets) {
+ detailsSb.append("- ").append(db.getHashSetName()).append("
\n"); //NON-NLS
}
detailsSb.append("
"); //NON-NLS
diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java
old mode 100755
new mode 100644
index 975f36b993..5d7a776090
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java
@@ -65,7 +65,7 @@ public class HashDbManager implements PropertyChangeListener {
private static final String HASH_DATABASE_FILE_EXTENSON = "kdb"; //NON-NLS
private static HashDbManager instance = null;
- private List hashSets = new ArrayList<>();
+ private List hashSets = new ArrayList<>();
private Set hashSetNames = new HashSet<>();
private Set hashSetPaths = new HashSet<>();
PropertyChangeSupport changeSupport = new PropertyChangeSupport(HashDbManager.class);
@@ -153,7 +153,6 @@ 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);
@@ -161,12 +160,7 @@ 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()) {
@@ -181,7 +175,7 @@ public class HashDbManager implements PropertyChangeListener {
throw new HashDbManagerException(NbBundle.getMessage(HashDbManager.class, "HashDbManager.duplicateHashSetNameExceptionMsg", hashSetName));
}
- hashDb = addFileTypeHashDatabase(SleuthkitJNI.openHashDatabase(path), hashSetName, searchDuringIngest, sendIngestMessages, knownFilesType);
+ hashDb = addHashDatabase(SleuthkitJNI.openHashDatabase(path), hashSetName, searchDuringIngest, sendIngestMessages, knownFilesType);
} catch (TskCoreException ex) {
throw new HashDbManagerException(ex.getMessage());
}
@@ -206,7 +200,6 @@ 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 {
@@ -218,14 +211,8 @@ 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);
@@ -245,16 +232,16 @@ public class HashDbManager implements PropertyChangeListener {
throw new HashDbManagerException(NbBundle.getMessage(HashDbManager.class, "HashDbManager.duplicateHashSetNameExceptionMsg", hashSetName));
}
- hashDb = addFileTypeHashDatabase(SleuthkitJNI.createHashDatabase(path), hashSetName, searchDuringIngest, sendIngestMessages, knownFilesType);
+ hashDb = addHashDatabase(SleuthkitJNI.createHashDatabase(path), hashSetName, searchDuringIngest, sendIngestMessages, knownFilesType);
} catch (TskCoreException ex) {
throw new HashDbManagerException(ex.getMessage());
}
return hashDb;
}
- private HashDb addFileTypeHashDatabase(int handle, String hashSetName, boolean searchDuringIngest, boolean sendIngestMessages, HashDb.KnownFilesType knownFilesType) throws TskCoreException {
+ private SleuthkitHashSet addHashDatabase(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);
+ SleuthkitHashSet hashDb = new SleuthkitHashSet(handle, hashSetName, searchDuringIngest, sendIngestMessages, knownFilesType);
// Get the indentity data before updating the collections since the
// accessor methods may throw.
@@ -287,7 +274,7 @@ public class HashDbManager implements PropertyChangeListener {
return hashDb;
}
- public CentralRepoHashDb addExistingCentralRepoHashSet(String hashSetName, String version, int referenceSetID,
+ CentralRepoHashSet addExistingCentralRepoHashSet(String hashSetName, String version, int referenceSetID,
boolean searchDuringIngest, boolean sendIngestMessages, HashDb.KnownFilesType knownFilesType,
boolean readOnly) throws TskCoreException{
@@ -295,7 +282,7 @@ public class HashDbManager implements PropertyChangeListener {
throw new TskCoreException("Could not load central repository database " + hashSetName + " - central repository is not enabled");
}
- CentralRepoHashDb db = new CentralRepoHashDb(hashSetName, version, referenceSetID, searchDuringIngest,
+ CentralRepoHashSet db = new CentralRepoHashSet(hashSetName, version, referenceSetID, searchDuringIngest,
sendIngestMessages, knownFilesType, readOnly);
if(! db.isValid()){
@@ -319,7 +306,7 @@ public class HashDbManager implements PropertyChangeListener {
}
- synchronized void indexHashDatabase(HashDb hashDb) {
+ synchronized void indexHashDatabase(SleuthkitHashSet hashDb) {
hashDb.addPropertyChangeListener(this);
HashDbIndexer creator = new HashDbIndexer(hashDb);
creator.execute();
@@ -327,8 +314,8 @@ public class HashDbManager implements PropertyChangeListener {
@Override
public void propertyChange(PropertyChangeEvent event) {
- if (event.getPropertyName().equals(HashDb.Event.INDEXING_DONE.name())) {
- HashDb hashDb = (HashDb) event.getNewValue();
+ if (event.getPropertyName().equals(SleuthkitHashSet.Event.INDEXING_DONE.name())) {
+ SleuthkitHashSet hashDb = (SleuthkitHashSet) event.getNewValue();
if (null != hashDb) {
try {
String indexPath = hashDb.getIndexPath();
@@ -350,12 +337,12 @@ public class HashDbManager implements PropertyChangeListener {
*
* @throws HashDbManagerException
*/
- public synchronized void removeHashDatabase(HashDatabase hashDb) throws HashDbManagerException {
+ public synchronized void removeHashDatabase(HashDb hashDb) throws HashDbManagerException {
this.removeHashDatabaseNoSave(hashDb);
this.save();
}
- public synchronized void removeHashDatabaseNoSave(HashDatabase hashDatabase) throws HashDbManagerException {
+ public synchronized void removeHashDatabaseNoSave(HashDb hashDb) throws HashDbManagerException {
// Don't remove a database if ingest is running
boolean ingestIsRunning = IngestManager.getInstance().isIngestRunning();
if (ingestIsRunning) {
@@ -365,36 +352,36 @@ public class HashDbManager implements PropertyChangeListener {
// and remove its hash set name from the hash set used to ensure unique
// hash set names are used, before undertaking These operations will succeed and constitute
// a mostly effective removal, even if the subsequent operations fail.
- String hashSetName = hashDatabase.getHashSetName();
+ String hashSetName = hashDb.getHashSetName();
hashSetNames.remove(hashSetName);
- hashSets.remove(hashDatabase);
+ hashSets.remove(hashDb);
// Now undertake the operations that could throw.
- // Indexing is only relevanet for file type hashsets
- if(hashDatabase instanceof HashDb){
- HashDb hashDb = (HashDb)hashDatabase;
+ // Indexing is only relevanet for sleuthkit hashsets
+ if(hashDb instanceof SleuthkitHashSet){
+ SleuthkitHashSet hashDatabase = (SleuthkitHashSet)hashDb;
try {
- if(hashDb.hasIndex()){
- hashSetPaths.remove(hashDb.getIndexPath());
+ if(hashDatabase.hasIndex()){
+ hashSetPaths.remove(hashDatabase.getIndexPath());
}
} catch (TskCoreException ex) {
- Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error getting index path of " + hashDb.getHashSetName() + " hash database when removing the database", ex); //NON-NLS
+ Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error getting index path of " + hashDatabase.getHashSetName() + " hash database when removing the database", ex); //NON-NLS
}
try {
- if (!hashDb.hasIndexOnly()) {
- hashSetPaths.remove(hashDb.getDatabasePath());
+ if (!hashDatabase.hasIndexOnly()) {
+ hashSetPaths.remove(hashDatabase.getDatabasePath());
}
} catch (TskCoreException ex) {
- Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error getting database path of " + hashDb.getHashSetName() + " hash database when removing the database", ex); //NON-NLS
+ Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error getting database path of " + hashDatabase.getHashSetName() + " hash database when removing the database", ex); //NON-NLS
}
- }
- try {
- hashDatabase.close();
- } catch (TskCoreException ex) {
- Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error closing " + hashDatabase.getHashSetName() + " hash database when removing the database", ex); //NON-NLS
+ try {
+ hashDatabase.close();
+ } catch (TskCoreException ex) {
+ Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error closing " + hashDb.getHashSetName() + " hash database when removing the database", ex); //NON-NLS
+ }
}
// Let any external listeners know that a set has been deleted
@@ -418,56 +405,24 @@ public class HashDbManager implements PropertyChangeListener {
throw new HashDbManagerException(NbBundle.getMessage(this.getClass(), "HashDbManager.saveErrorExceptionMsg"));
}
}
-
+
/**
* Gets all of the hash databases used to classify files as known or known
- * bad.
+ * bad. Will add any new central repository databases to the list before
+ * returning it.
*
* @return A list, possibly empty, of hash databases.
*/
- @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;
- }
-
- /**
- * 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;
- }
-
- /**
- * Adds any new central repository databases to the list of hashes
- * before returning a copy of the hash set list
- * @return A list, possibly empty, of hash databases.
- */
- public synchronized List refreshAndGetAllHashDatabases(){
try{
updateHashSetsFromCentralRepository();
} catch (TskCoreException ex){
Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error loading central repository hash sets", ex); //NON-NLS
}
- return getAllHashDatabases();
+
+ List hashDbs = new ArrayList<>();
+ hashDbs.addAll(this.hashSets);
+ return hashDbs;
}
/**
@@ -475,49 +430,31 @@ public class HashDbManager implements PropertyChangeListener {
*
* @return A list, possibly empty, of hash databases.
*/
- @Deprecated
public synchronized List getKnownFileHashSets() {
List hashDbs = new ArrayList<>();
- this.hashSets.stream().filter((thisSet) -> ((thisSet instanceof HashDb) && (thisSet.getKnownFilesType() == HashDb.KnownFilesType.KNOWN))).forEach((thisSet) -> {
- hashDbs.add((HashDb)thisSet);
- });
- return hashDbs;
- }
-
- /**
- * 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<>();
+ try{
+ updateHashSetsFromCentralRepository();
+ } catch (TskCoreException ex){
+ Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error loading central repository hash sets", ex); //NON-NLS
+ }
this.hashSets.stream().filter((db) -> (db.getKnownFilesType() == HashDb.KnownFilesType.KNOWN)).forEach((db) -> {
hashDbs.add(db);
});
return hashDbs;
- }
+ }
/**
* Gets all of the hash databases used to classify files as notable.
*
* @return A list, possibly empty, of hash databases.
*/
- @Deprecated
public synchronized List getKnownBadFileHashSets() {
List hashDbs = new ArrayList<>();
- this.hashSets.stream().filter((thisSet) -> ((thisSet instanceof HashDb) && (thisSet.getKnownFilesType() == HashDb.KnownFilesType.KNOWN_BAD))).forEach((thisSet) -> {
- hashDbs.add((HashDb)thisSet);
- });
- return hashDbs;
- }
-
- /**
- * 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<>();
+ try{
+ updateHashSetsFromCentralRepository();
+ } catch (TskCoreException ex){
+ Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error loading central repository hash sets", ex); //NON-NLS
+ }
this.hashSets.stream().filter((db) -> (db.getKnownFilesType() == HashDb.KnownFilesType.KNOWN_BAD)).forEach((db) -> {
hashDbs.add(db);
});
@@ -529,28 +466,18 @@ public class HashDbManager implements PropertyChangeListener {
*
* @return A list, possibly empty, of hash databases.
*/
- @Deprecated
public synchronized List getUpdateableHashSets() {
- List updateableDbs = new ArrayList<>();
- List updateableHashSets = getUpdateableHashSets(this.hashSets);
- updateableHashSets.stream().filter((db) -> (db instanceof HashDb)).forEach((db) -> {
- updateableDbs.add((HashDb)db);
- });
- return updateableDbs;
- }
-
- /**
- * 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);
}
- private List getUpdateableHashSets(List hashDbs) {
- ArrayList updateableDbs = new ArrayList<>();
- for (HashDatabase db : hashDbs) {
+ private List getUpdateableHashSets(List hashDbs) {
+ ArrayList updateableDbs = new ArrayList<>();
+ try{
+ updateHashSetsFromCentralRepository();
+ } catch (TskCoreException ex){
+ Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error loading central repository hash sets", ex); //NON-NLS
+ }
+ for (HashDb db : hashDbs) {
try {
if (db.isUpdateable()) {
updateableDbs.add(db);
@@ -572,9 +499,9 @@ public class HashDbManager implements PropertyChangeListener {
// Defaults for fields not stored in the central repository:
// searchDuringIngest: false
// sendIngestMessages: true if the hash set is notable
- boolean sendIngestMessages = globalSet.getKnownStatus().equals(HashDb.KnownFilesType.KNOWN_BAD);
+ boolean sendIngestMessages = convertFileKnown(globalSet.getFileKnownStatus()).equals(HashDb.KnownFilesType.KNOWN_BAD);
crHashSets.add(new HashDbInfo(globalSet.getSetName(), globalSet.getVersion(),
- globalSet.getGlobalSetID(), globalSet.getKnownStatus(), globalSet.isReadOnly(), false, sendIngestMessages));
+ globalSet.getGlobalSetID(), convertFileKnown(globalSet.getFileKnownStatus()), globalSet.isReadOnly(), false, sendIngestMessages));
}
} catch (EamDbException ex){
Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error loading central repository hash sets", ex); //NON-NLS
@@ -582,6 +509,13 @@ public class HashDbManager implements PropertyChangeListener {
}
return crHashSets;
}
+
+ private static HashDb.KnownFilesType convertFileKnown(TskData.FileKnown fileKnown){
+ if(fileKnown.equals(TskData.FileKnown.BAD)){
+ return HashDb.KnownFilesType.KNOWN_BAD;
+ }
+ return HashDb.KnownFilesType.KNOWN;
+ }
/**
* Restores the last saved hash sets configuration. This supports
@@ -595,12 +529,14 @@ public class HashDbManager implements PropertyChangeListener {
loadHashsetsConfiguration();
}
- private void closeHashDatabases(List hashDatabases) {
- for (HashDatabase database : hashDatabases) {
- try {
- database.close();
- } catch (TskCoreException ex) {
- Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error closing " + database.getHashSetName() + " hash database", ex); //NON-NLS
+ private void closeHashDatabases(List hashDatabases) {
+ for (HashDb database : hashDatabases) {
+ if(database instanceof SleuthkitHashSet){
+ try {
+ ((SleuthkitHashSet)database).close();
+ } catch (TskCoreException ex) {
+ Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error closing " + database.getHashSetName() + " hash database", ex); //NON-NLS
+ }
}
}
hashDatabases.clear();
@@ -631,7 +567,7 @@ public class HashDbManager implements PropertyChangeListener {
if(hashDbInfo.isFileDatabaseType()){
String dbPath = this.getValidFilePath(hashDbInfo.getHashSetName(), hashDbInfo.getPath());
if (dbPath != null) {
- addFileTypeHashDatabase(SleuthkitJNI.openHashDatabase(dbPath), hashDbInfo.getHashSetName(), hashDbInfo.getSearchDuringIngest(), hashDbInfo.getSendIngestMessages(), hashDbInfo.getKnownFilesType());
+ addHashDatabase(SleuthkitJNI.openHashDatabase(dbPath), hashDbInfo.getHashSetName(), hashDbInfo.getSearchDuringIngest(), hashDbInfo.getSendIngestMessages(), hashDbInfo.getKnownFilesType());
} else {
logger.log(Level.WARNING, Bundle.HashDbManager_noDbPath_message(hashDbInfo.getHashSetName()));
allDatabasesLoadedCorrectly = false;
@@ -687,7 +623,7 @@ public class HashDbManager implements PropertyChangeListener {
}
}
- void updateHashSetsFromCentralRepository() throws TskCoreException {
+ private void updateHashSetsFromCentralRepository() throws TskCoreException {
if(EamDb.isEnabled()){
List crHashDbInfoList = getCentralRepoHashSetsFromDatabase();
for(HashDbInfo hashDbInfo : crHashDbInfoList) {
@@ -702,7 +638,7 @@ public class HashDbManager implements PropertyChangeListener {
}
private boolean hashDbInfoIsNew(HashDbInfo dbInfo){
- for(HashDatabase db:this.hashSets){
+ for(HashDb db:this.hashSets){
if(dbInfo.matches(db)){
return false;
}
@@ -757,87 +693,8 @@ public class HashDbManager implements PropertyChangeListener {
return filePath;
}
- public static interface HashDatabase {
- enum DatabaseType{
- FILE,
- CENTRAL_REPOSITORY
- };
+ public static abstract class HashDb {
- public String getHashSetName();
-
- public String getDisplayName();
-
- public String getDatabasePath() throws TskCoreException;
-
- public HashDb.KnownFilesType getKnownFilesType();
-
- public boolean getSearchDuringIngest();
-
- void setSearchDuringIngest(boolean useForIngest);
-
- public boolean getSendIngestMessages();
-
- void setSendIngestMessages(boolean showInboxMessages);
-
- /**
- * Indicates whether the hash database accepts updates.
- *
- * @return True if the database accepts updates, false otherwise.
- *
- * @throws org.sleuthkit.datamodel.TskCoreException
- */
- public boolean isUpdateable() throws TskCoreException;
-
- /**
- * Adds hashes of content (if calculated) to the hash database.
- *
- * @param content The content for which the calculated hashes, if any,
- * are to be added to the hash database.
- *
- * @throws TskCoreException
- */
- public void addHashes(Content content) throws TskCoreException;
-
- public void addHashes(Content content, String comment) throws TskCoreException;
-
- public void addHashes(List hashes) throws TskCoreException;
-
- public boolean lookupMD5Quick(Content content) throws TskCoreException;
-
- public HashHitInfo lookupMD5(Content content) throws TskCoreException;
-
- /**
- * Returns whether this database can be enabled.
- * For file type, this is the same as checking that it has an index
- * @return true if is valid, false otherwise
- * @throws TskCoreException
- */
- public boolean isValid() throws TskCoreException;
-
- public int getHandle();
-
- public void firePropertyChange(String propertyName, Object oldValue, Object newValue);
-
- public void addPropertyChangeListener(PropertyChangeListener pcl);
-
- public void removePropertyChangeListener(PropertyChangeListener pcl);
-
- void close() throws TskCoreException;
-
- @Override
- public String toString();
-
- DatabaseType getDatabaseType();
-
-
- }
-
- /**
- * Instances of this class represent hash databases used to classify files
- * as known or know bad.
- */
- public static class HashDb implements HashDatabase{
-
/**
* Indicates how files with hashes stored in a particular hash database
* object should be classified.
@@ -864,6 +721,79 @@ public class HashDbManager implements PropertyChangeListener {
INDEXING_DONE
}
+
+ public abstract String getHashSetName();
+
+ abstract String getDisplayName();
+
+ public abstract String getDatabasePath() throws TskCoreException;
+
+ public abstract HashDb.KnownFilesType getKnownFilesType();
+
+ public abstract boolean getSearchDuringIngest();
+
+ abstract void setSearchDuringIngest(boolean useForIngest);
+
+ public abstract boolean getSendIngestMessages();
+
+ abstract void setSendIngestMessages(boolean showInboxMessages);
+
+ /**
+ * Indicates whether the hash database accepts updates.
+ *
+ * @return True if the database accepts updates, false otherwise.
+ *
+ * @throws org.sleuthkit.datamodel.TskCoreException
+ */
+ public abstract boolean isUpdateable() throws TskCoreException;
+
+ /**
+ * Adds hashes of content (if calculated) to the hash database.
+ *
+ * @param content The content for which the calculated hashes, if any,
+ * are to be added to the hash database.
+ *
+ * @throws TskCoreException
+ */
+ public abstract void addHashes(Content content) throws TskCoreException;
+
+ public abstract void addHashes(Content content, String comment) throws TskCoreException;
+
+ public abstract void addHashes(List hashes) throws TskCoreException;
+
+ public abstract boolean lookupMD5Quick(Content content) throws TskCoreException;
+
+ public abstract HashHitInfo lookupMD5(Content content) throws TskCoreException;
+
+ /**
+ * Returns whether this database can be enabled.
+ * For file type, this is the same as checking that it has an index
+ * @return true if is valid, false otherwise
+ * @throws TskCoreException
+ */
+ abstract boolean isValid() throws TskCoreException;
+
+ public abstract String getIndexPath() throws TskCoreException;
+
+ public abstract boolean hasIndexOnly() throws TskCoreException;
+
+ public abstract void firePropertyChange(String propertyName, Object oldValue, Object newValue);
+
+ public abstract void addPropertyChangeListener(PropertyChangeListener pcl);
+
+ public abstract void removePropertyChangeListener(PropertyChangeListener pcl);
+
+ @Override
+ public abstract String toString();
+
+ }
+
+ /**
+ * Instances of this class represent hash databases used to classify files
+ * as known or know bad.
+ */
+ class SleuthkitHashSet extends HashDb{
+
private static final long serialVersionUID = 1L;
private final int handle;
private final String hashSetName;
@@ -873,7 +803,7 @@ public class HashDbManager implements PropertyChangeListener {
private boolean indexing;
private final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
- private HashDb(int handle, String hashSetName, boolean useForIngest, boolean sendHitMessages, KnownFilesType knownFilesType) {
+ private SleuthkitHashSet(int handle, String hashSetName, boolean useForIngest, boolean sendHitMessages, KnownFilesType knownFilesType) {
this.handle = handle;
this.hashSetName = hashSetName;
this.searchDuringIngest = useForIngest;
@@ -903,8 +833,7 @@ public class HashDbManager implements PropertyChangeListener {
propertyChangeSupport.removePropertyChangeListener(pcl);
}
- @Override
- public int getHandle(){
+ int getHandle(){
return handle;
}
@@ -914,7 +843,7 @@ public class HashDbManager implements PropertyChangeListener {
}
@Override
- public String getDisplayName(){
+ String getDisplayName(){
return getHashSetName();
}
@@ -926,12 +855,8 @@ public class HashDbManager implements PropertyChangeListener {
public void setIndexing(boolean indexing){
this.indexing = indexing;
}
-
- @Override
- public DatabaseType getDatabaseType(){
- return DatabaseType.FILE;
- }
+ @Override
public String getIndexPath() throws TskCoreException {
return SleuthkitJNI.getHashDatabaseIndexPath(handle);
}
@@ -947,7 +872,7 @@ public class HashDbManager implements PropertyChangeListener {
}
@Override
- public void setSearchDuringIngest(boolean useForIngest) {
+ void setSearchDuringIngest(boolean useForIngest) {
this.searchDuringIngest = useForIngest;
}
@@ -957,7 +882,7 @@ public class HashDbManager implements PropertyChangeListener {
}
@Override
- public void setSendIngestMessages(boolean showInboxMessages) {
+ void setSendIngestMessages(boolean showInboxMessages) {
this.sendIngestMessages = showInboxMessages;
}
@@ -1072,23 +997,24 @@ public class HashDbManager implements PropertyChangeListener {
* @throws TskCoreException
*/
@Override
- public boolean isValid() throws TskCoreException {
+ boolean isValid() throws TskCoreException {
return hasIndex();
}
- public boolean hasIndex() throws TskCoreException {
+ boolean hasIndex() throws TskCoreException {
return SleuthkitJNI.hashDatabaseHasLookupIndex(handle);
}
+ @Override
public boolean hasIndexOnly() throws TskCoreException {
return SleuthkitJNI.hashDatabaseIsIndexOnly(handle);
}
- public boolean canBeReIndexed() throws TskCoreException {
+ boolean canBeReIndexed() throws TskCoreException {
return SleuthkitJNI.hashDatabaseCanBeReindexed(handle);
}
- public boolean isIndexing() {
+ boolean isIndexing() {
return indexing;
}
@@ -1097,8 +1023,7 @@ public class HashDbManager implements PropertyChangeListener {
this.propertyChangeSupport.firePropertyChange(propertyName, oldValue, newValue);
}
- @Override
- public void close() throws TskCoreException {
+ private void close() throws TskCoreException {
SleuthkitJNI.closeHashDatabase(handle);
}
@@ -1126,7 +1051,7 @@ public class HashDbManager implements PropertyChangeListener {
if (getClass() != obj.getClass()) {
return false;
}
- final HashDb other = (HashDb) obj;
+ final SleuthkitHashSet other = (SleuthkitHashSet) obj;
if (!Objects.equals(this.hashSetName, other.hashSetName)) {
return false;
}
@@ -1141,7 +1066,7 @@ public class HashDbManager implements PropertyChangeListener {
* Instances of this class represent hash databases used to classify files
* as known or know bad.
*/
- public static class CentralRepoHashDb implements HashDatabase{
+ class CentralRepoHashSet extends HashDb{
private static final long serialVersionUID = 1L;
private final String hashSetName;
@@ -1155,7 +1080,7 @@ public class HashDbManager implements PropertyChangeListener {
private final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
@Messages({"HashDbManager.CentralRepoHashDb.orgError=Error loading organization"})
- private CentralRepoHashDb(String hashSetName, String version, int referenceSetID,
+ private CentralRepoHashSet(String hashSetName, String version, int referenceSetID,
boolean useForIngest, boolean sendHitMessages, HashDb.KnownFilesType knownFilesType,
boolean readOnly)
throws TskCoreException{
@@ -1170,7 +1095,7 @@ public class HashDbManager implements PropertyChangeListener {
try{
orgName = EamDb.getInstance().getReferenceSetOrganization(referenceSetID).getName();
} catch (EamDbException ex){
- Logger.getLogger(HashDb.class.getName()).log(Level.SEVERE, "Error looking up central repository organization", ex); //NON-NLS
+ Logger.getLogger(SleuthkitHashSet.class.getName()).log(Level.SEVERE, "Error looking up central repository organization for reference set " + referenceSetID, ex); //NON-NLS
orgName = Bundle.HashDbManager_CentralRepoHashDb_orgError();
}
}
@@ -1197,8 +1122,8 @@ public class HashDbManager implements PropertyChangeListener {
}
@Override
- public int getHandle(){
- return 0;
+ public boolean hasIndexOnly() throws TskCoreException{
+ return true;
}
@Override
@@ -1215,15 +1140,15 @@ public class HashDbManager implements PropertyChangeListener {
}
}
- public String getVersion(){
+ String getVersion(){
return version;
}
- public String getOrgName(){
+ String getOrgName(){
return orgName;
}
- public int getReferenceSetID(){
+ int getReferenceSetID(){
return referenceSetID;
}
@@ -1231,12 +1156,8 @@ public class HashDbManager implements PropertyChangeListener {
public String getDatabasePath() throws TskCoreException {
return "";
}
-
- @Override
- public DatabaseType getDatabaseType(){
- return DatabaseType.CENTRAL_REPOSITORY;
- }
+ @Override
public String getIndexPath() throws TskCoreException {
return "";
}
@@ -1252,7 +1173,7 @@ public class HashDbManager implements PropertyChangeListener {
}
@Override
- public void setSearchDuringIngest(boolean useForIngest) {
+ void setSearchDuringIngest(boolean useForIngest) {
this.searchDuringIngest = useForIngest;
}
@@ -1262,7 +1183,7 @@ public class HashDbManager implements PropertyChangeListener {
}
@Override
- public void setSendIngestMessages(boolean showInboxMessages) {
+ void setSendIngestMessages(boolean showInboxMessages) {
this.sendIngestMessages = showInboxMessages;
}
@@ -1349,7 +1270,7 @@ public class HashDbManager implements PropertyChangeListener {
EamDb.getInstance().bulkInsertReferenceTypeEntries(globalFileInstances,
EamDb.getInstance().getCorrelationTypeById(CorrelationAttribute.FILES_TYPE_ID));
} catch (EamDbException ex){
- throw new TskCoreException("Error adding hashes", ex);
+ throw new TskCoreException("Error adding hashes to " + getDisplayName(), ex);
}
}
@@ -1370,9 +1291,10 @@ public class HashDbManager implements PropertyChangeListener {
AbstractFile file = (AbstractFile) content;
if (null != file.getMd5Hash()) {
try{
- return EamDb.getInstance().isHashInReferenceSet(file.getMd5Hash(), this.referenceSetID);
+ return EamDb.getInstance().isFileHashInReferenceSet(file.getMd5Hash(), this.referenceSetID);
} catch (EamDbException ex){
- Logger.getLogger(HashDb.class.getName()).log(Level.SEVERE, "Error performing central reposiotry hash lookup", ex); //NON-NLS
+ Logger.getLogger(SleuthkitHashSet.class.getName()).log(Level.SEVERE, "Error performing central reposiotry hash lookup for hash "
+ + file.getMd5Hash() + " in reference set " + referenceSetID, ex); //NON-NLS
throw new TskCoreException("Error performing central reposiotry hash lookup", ex);
}
}
@@ -1398,12 +1320,13 @@ public class HashDbManager implements PropertyChangeListener {
AbstractFile file = (AbstractFile) content;
if (null != file.getMd5Hash()) {
try{
- if(EamDb.getInstance().isHashInReferenceSet(file.getMd5Hash(), this.referenceSetID)){
+ if(EamDb.getInstance().isFileHashInReferenceSet(file.getMd5Hash(), this.referenceSetID)){
// Make a bare-bones HashHitInfo for now
result = new HashHitInfo(file.getMd5Hash(), "", "");
}
} catch (EamDbException ex){
- Logger.getLogger(HashDb.class.getName()).log(Level.SEVERE, "Error performing central reposiotry hash lookup", ex); //NON-NLS
+ Logger.getLogger(SleuthkitHashSet.class.getName()).log(Level.SEVERE, "Error performing central reposiotry hash lookup for hash "
+ + file.getMd5Hash() + " in reference set " + referenceSetID, ex); //NON-NLS
throw new TskCoreException("Error performing central reposiotry hash lookup", ex);
}
}
@@ -1415,17 +1338,16 @@ public class HashDbManager implements PropertyChangeListener {
* Returns whether this database can be enabled.
*
* @return true if is valid, false otherwise
- * @throws TskCoreException
*/
@Override
- public boolean isValid() {
+ boolean isValid() {
if(! EamDb.isEnabled()) {
return false;
}
try{
return EamDb.getInstance().referenceSetIsValid(this.referenceSetID, this.hashSetName, this.version);
} catch (EamDbException ex){
- Logger.getLogger(CentralRepoHashDb.class.getName()).log(Level.SEVERE, "Error validating hash database " + hashSetName, ex); //NON-NLS
+ Logger.getLogger(CentralRepoHashSet.class.getName()).log(Level.SEVERE, "Error validating hash database " + hashSetName, ex); //NON-NLS
return false;
}
}
@@ -1434,11 +1356,6 @@ public class HashDbManager implements PropertyChangeListener {
public void firePropertyChange(String propertyName, Object oldValue, Object newValue){
this.propertyChangeSupport.firePropertyChange(propertyName, oldValue, newValue);
}
-
- @Override
- public void close() throws TskCoreException {
-
- }
@Override
public String toString(){
@@ -1464,7 +1381,7 @@ public class HashDbManager implements PropertyChangeListener {
if (getClass() != obj.getClass()) {
return false;
}
- final CentralRepoHashDb other = (CentralRepoHashDb) obj;
+ final CentralRepoHashSet other = (CentralRepoHashSet) obj;
if (!Objects.equals(this.hashSetName, other.hashSetName)) {
return false;
}
@@ -1484,9 +1401,9 @@ public class HashDbManager implements PropertyChangeListener {
private class HashDbIndexer extends SwingWorker {
private ProgressHandle progress = null;
- private HashDb hashDb = null;
+ private SleuthkitHashSet hashDb = null;
- HashDbIndexer(HashDb hashDb) {
+ HashDbIndexer(SleuthkitHashSet hashDb) {
this.hashDb = hashDb;
}
@@ -1500,7 +1417,7 @@ public class HashDbManager implements PropertyChangeListener {
try {
SleuthkitJNI.createLookupIndexForHashDatabase(hashDb.getHandle());
} catch (TskCoreException ex) {
- Logger.getLogger(HashDb.class.getName()).log(Level.SEVERE, "Error indexing hash database", ex); //NON-NLS
+ Logger.getLogger(HashDbIndexer.class.getName()).log(Level.SEVERE, "Error indexing hash set " + hashDb.getHashSetName(), ex); //NON-NLS
JOptionPane.showMessageDialog(null,
NbBundle.getMessage(this.getClass(),
"HashDbManager.dlgMsg.errorIndexingHashSet",
@@ -1530,7 +1447,7 @@ public class HashDbManager implements PropertyChangeListener {
}
try {
- hashDb.firePropertyChange(HashDb.Event.INDEXING_DONE.toString(), null, hashDb);
+ hashDb.firePropertyChange(SleuthkitHashSet.Event.INDEXING_DONE.toString(), null, hashDb);
hashDb.firePropertyChange(HashDbManager.SetEvt.DB_INDEXED.toString(), null, hashDb.getHashSetName());
} catch (Exception e) {
logger.log(Level.SEVERE, "HashDbManager listener threw exception", e); //NON-NLS
diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleFactory.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleFactory.java
index 19a1d5ee21..2fb515832b 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().refreshAndGetAllHashDatabases());
+ return new HashLookupModuleSettings(true, HashDbManager.getInstance().getAllHashSets());
}
@Override
diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleSettings.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleSettings.java
index 9923c7f21b..04d6d0f143 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleSettings.java
@@ -26,8 +26,8 @@ import java.io.IOException;
import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDatabase;
import org.sleuthkit.autopsy.modules.hashdatabase.HashLookupSettings.HashDbInfo;
+import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDb;
/**
* Ingest job settings for the hash lookup module.
@@ -42,7 +42,7 @@ final class HashLookupModuleSettings implements IngestModuleIngestJobSettings {
private boolean shouldCalculateHashes = true;
private List databaseInfoList;
- HashLookupModuleSettings(boolean shouldCalculateHashes, List hashDbList){
+ HashLookupModuleSettings(boolean shouldCalculateHashes, List hashDbList){
this.shouldCalculateHashes = shouldCalculateHashes;
try{
databaseInfoList = HashLookupSettings.convertHashSetList(hashDbList);
@@ -76,12 +76,12 @@ final class HashLookupModuleSettings implements IngestModuleIngestJobSettings {
* @param disabledHashSets A list of disabled hash sets.
*/
HashLookupModuleSettings(boolean shouldCalculateHashes,
- List enabledHashSets,
- List disabledHashSets) {
+ List enabledHashSets,
+ List disabledHashSets) {
this.shouldCalculateHashes = shouldCalculateHashes;
databaseInfoList = new ArrayList<>();
- for(HashDatabase db:enabledHashSets){
+ for(HashDb db:enabledHashSets){
try{
HashDbInfo dbInfo = new HashDbInfo(db);
dbInfo.setSearchDuringIngest(true);
@@ -90,7 +90,7 @@ final class HashLookupModuleSettings implements IngestModuleIngestJobSettings {
Logger.getLogger(HashLookupModuleSettings.class.getName()).log(Level.SEVERE, "Error creating hash database settings for " + db.getHashSetName(), ex); //NON-NLS
}
}
- for(HashDatabase db:disabledHashSets){
+ for(HashDb db:disabledHashSets){
try{
HashDbInfo dbInfo = new HashDbInfo(db);
dbInfo.setSearchDuringIngest(false);
@@ -128,15 +128,15 @@ final class HashLookupModuleSettings implements IngestModuleIngestJobSettings {
*
* @return True if the hash set is enabled, false otherwise.
*/
- boolean isHashSetEnabled(HashDatabase db) {
+ boolean isHashSetEnabled(HashDb db) {
for(HashDbInfo dbInfo:databaseInfoList){
if(dbInfo.matches(db)){
return dbInfo.getSearchDuringIngest();
}
}
- // We didn't find it, so use the default value
- return db.getDefaultSearchDuringIngest();
+ // We didn't find it, so use whatever default value is in the HashDb object
+ return db.getSearchDuringIngest();
}
/**
@@ -150,7 +150,7 @@ final class HashLookupModuleSettings implements IngestModuleIngestJobSettings {
}
try{
- databaseInfoList = HashLookupSettings.convertHashSetList(HashDbManager.getInstance().getAllHashDatabases());
+ databaseInfoList = HashLookupSettings.convertHashSetList(HashDbManager.getInstance().getAllHashSets());
} 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
old mode 100755
new mode 100644
index 1e83fb77c6..63d7a25bfc
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleSettingsPanel.java
@@ -30,8 +30,8 @@ import javax.swing.table.TableColumn;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
-import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDatabase;
import org.sleuthkit.datamodel.TskCoreException;
+import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDb;
/**
@@ -53,18 +53,13 @@ public final class HashLookupModuleSettingsPanel extends IngestModuleIngestJobSe
}
private void initializeHashSetModels(HashLookupModuleSettings settings) {
- try{
- hashDbManager.updateHashSetsFromCentralRepository();
- } catch (TskCoreException ex){
- Logger.getLogger(HashLookupModuleSettingsPanel.class.getName()).log(Level.SEVERE, "Error updating central repository hash sets", ex); //NON-NLS
- }
- initializeHashSetModels(settings, hashDbManager.getKnownFileHashDatabases(), knownHashSetModels);
- initializeHashSetModels(settings, hashDbManager.getNotableFileHashDatabases(), knownBadHashSetModels);
+ initializeHashSetModels(settings, validSetsOnly(hashDbManager.getKnownFileHashSets()), knownHashSetModels);
+ initializeHashSetModels(settings, validSetsOnly(hashDbManager.getKnownBadFileHashSets()), knownBadHashSetModels);
}
- private void initializeHashSetModels(HashLookupModuleSettings settings, List hashDbs, List hashSetModels) {
+ private void initializeHashSetModels(HashLookupModuleSettings settings, List hashDbs, List hashSetModels) {
hashSetModels.clear();
- for (HashDatabase db : hashDbs) {
+ for (HashDb db : hashDbs) {
hashSetModels.add(new HashSetModel(db, settings.isHashSetEnabled(db), isHashDbValid(db)));
}
}
@@ -105,15 +100,15 @@ public final class HashLookupModuleSettingsPanel extends IngestModuleIngestJobSe
@Override
public IngestModuleIngestJobSettings getSettings() {
- List enabledHashSets = new ArrayList<>();
- List disabledHashSets = new ArrayList<>();
+ List enabledHashSets = new ArrayList<>();
+ List disabledHashSets = new ArrayList<>();
addHashSets(knownHashSetModels, enabledHashSets, disabledHashSets);
addHashSets(knownBadHashSetModels, enabledHashSets, disabledHashSets);
return new HashLookupModuleSettings(alwaysCalcHashesCheckbox.isSelected(),
enabledHashSets, disabledHashSets);
}
- private void addHashSets(List hashSetModels, List enabledHashSets, List disabledHashSets) {
+ private void addHashSets(List hashSetModels, List enabledHashSets, List disabledHashSets) {
for (HashSetModel model : hashSetModels) {
if (model.isEnabled() && model.isValid()) {
enabledHashSets.add(model.getDatabase());
@@ -130,19 +125,33 @@ public final class HashLookupModuleSettingsPanel extends IngestModuleIngestJobSe
}
private void updateHashSetModels() {
- updateHashSetModels(hashDbManager.getKnownFileHashDatabases(), knownHashSetModels);
- updateHashSetModels(hashDbManager.getNotableFileHashDatabases(), knownBadHashSetModels);
+ updateHashSetModels(validSetsOnly(hashDbManager.getKnownFileHashSets()), knownHashSetModels);
+ updateHashSetModels(validSetsOnly(hashDbManager.getKnownBadFileHashSets()), knownBadHashSetModels);
+ }
+
+ private List validSetsOnly(List hashDbs){
+ List validDbs = new ArrayList<>();
+ for(HashDb db:hashDbs){
+ try{
+ if(db.isValid()){
+ validDbs.add(db);
+ }
+ } catch (TskCoreException ex){
+ Logger.getLogger(HashLookupModuleSettingsPanel.class.getName()).log(Level.SEVERE, "Error checking validity for hash set (name = " + db.getHashSetName() + ")", ex); //NON-NLS
+ }
+ }
+ return validDbs;
}
- void updateHashSetModels(List hashDbs, List hashSetModels) {
+ void updateHashSetModels(List hashDbs, List hashSetModels) {
- List hashDatabases = new ArrayList<>(hashDbs);
+ List hashDatabases = new ArrayList<>(hashDbs);
// Update the hash sets and detect deletions.
List deletedHashSetModels = new ArrayList<>();
for (HashSetModel model : hashSetModels) {
boolean foundDatabase = false;
- for(HashDatabase db : hashDatabases){
+ for(HashDb db : hashDatabases){
if(model.getDatabase().equals(db)){
model.setValid(isHashDbValid(db));
hashDatabases.remove(db);
@@ -161,7 +170,7 @@ public final class HashLookupModuleSettingsPanel extends IngestModuleIngestJobSe
}
// Add any new hash sets. All new sets are enabled by default.
- for (HashDatabase db : hashDatabases) {
+ for (HashDb db : hashDatabases) {
hashSetModels.add(new HashSetModel(db, true, isHashDbValid(db)));
}
}
@@ -173,7 +182,7 @@ public final class HashLookupModuleSettingsPanel extends IngestModuleIngestJobSe
knownBadHashSetsTableModel.fireTableDataChanged();
}
- private boolean isHashDbValid(HashDatabase hashDb) {
+ private boolean isHashDbValid(HashDb hashDb) {
boolean isValid = false;
try {
isValid = hashDb.isValid();
@@ -185,17 +194,17 @@ public final class HashLookupModuleSettingsPanel extends IngestModuleIngestJobSe
private static final class HashSetModel {
- private final HashDatabase db;
+ private final HashDb db;
private boolean valid;
private boolean enabled;
- HashSetModel(HashDatabase db, boolean enabled, boolean valid) {
+ HashSetModel(HashDb db, boolean enabled, boolean valid) {
this.db = db;
this.enabled = enabled;
this.valid = valid;
}
- HashDatabase getDatabase(){
+ HashDb getDatabase(){
return db;
}
diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettings.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettings.java
index 89d807d507..948f18451d 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettings.java
@@ -36,13 +36,13 @@ import org.sleuthkit.autopsy.core.RuntimeProperties;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.coreutils.PlatformUtil;
import org.sleuthkit.autopsy.coreutils.XMLUtil;
-import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDatabase;
-import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDatabase.DatabaseType;
-import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.CentralRepoHashDb;
+import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.CentralRepoHashSet;
+import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.SleuthkitHashSet;
import org.sleuthkit.datamodel.TskCoreException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDb;
/**
* Class to represent the settings to be serialized for hash lookup.
@@ -74,9 +74,9 @@ final class HashLookupSettings implements Serializable {
this.hashDbInfoList = hashDbInfoList;
}
- static List convertHashSetList(List hashSets) throws HashLookupSettingsException{
+ static List convertHashSetList(List hashSets) throws HashLookupSettingsException{
List dbInfoList = new ArrayList<>();
- for(HashDbManager.HashDatabase db:hashSets){
+ for(HashDbManager.HashDb db:hashSets){
try{
dbInfoList.add(new HashDbInfo(db));
} catch (TskCoreException ex){
@@ -297,6 +297,11 @@ final class HashLookupSettings implements Serializable {
*/
static final class HashDbInfo implements Serializable {
+ enum DatabaseType{
+ FILE,
+ CENTRAL_REPOSITORY
+ };
+
private static final long serialVersionUID = 1L;
private final String hashSetName;
private final HashDbManager.HashDb.KnownFilesType knownFilesType;
@@ -342,9 +347,9 @@ final class HashLookupSettings implements Serializable {
dbType = DatabaseType.CENTRAL_REPOSITORY;
}
- HashDbInfo(HashDbManager.HashDatabase db) throws TskCoreException{
- if(db instanceof HashDbManager.HashDb){
- HashDbManager.HashDb fileTypeDb = (HashDbManager.HashDb)db;
+ HashDbInfo(HashDbManager.HashDb db) throws TskCoreException{
+ if(db instanceof HashDbManager.SleuthkitHashSet){
+ HashDbManager.SleuthkitHashSet fileTypeDb = (HashDbManager.SleuthkitHashSet)db;
this.hashSetName = fileTypeDb.getHashSetName();
this.knownFilesType = fileTypeDb.getKnownFilesType();
this.searchDuringIngest = fileTypeDb.getSearchDuringIngest();
@@ -359,7 +364,7 @@ final class HashLookupSettings implements Serializable {
this.path = fileTypeDb.getDatabasePath();
}
} else {
- HashDbManager.CentralRepoHashDb centralRepoDb = (HashDbManager.CentralRepoHashDb)db;
+ HashDbManager.CentralRepoHashSet centralRepoDb = (HashDbManager.CentralRepoHashSet)db;
this.hashSetName = centralRepoDb.getHashSetName();
this.version = centralRepoDb.getVersion();
this.knownFilesType = centralRepoDb.getKnownFilesType();
@@ -457,7 +462,7 @@ final class HashLookupSettings implements Serializable {
return dbType == DatabaseType.CENTRAL_REPOSITORY;
}
- boolean matches(HashDatabase hashDb){
+ boolean matches(HashDb hashDb){
if(hashDb == null){
return false;
}
@@ -466,7 +471,8 @@ final class HashLookupSettings implements Serializable {
return false;
}
- if( ! this.dbType.equals(hashDb.getDatabaseType())){
+ if((this.dbType == DatabaseType.CENTRAL_REPOSITORY) && (! (hashDb instanceof CentralRepoHashSet))
+ || (this.dbType == DatabaseType.FILE) && (! (hashDb instanceof SleuthkitHashSet))){
return false;
}
@@ -474,19 +480,15 @@ final class HashLookupSettings implements Serializable {
return false;
}
- if(this.dbType.equals(DatabaseType.FILE)){
- // FILE types will always have unique names, so no more testing required
- return true;
- }
-
- // Central repo tests
- CentralRepoHashDb crDb = (CentralRepoHashDb) hashDb;
- if(this.referenceSetID != crDb.getReferenceSetID()){
- return false;
- }
-
- if(! version.equals(crDb.getVersion())){
- return false;
+ if(hashDb instanceof CentralRepoHashSet){
+ CentralRepoHashSet crDb = (CentralRepoHashSet) hashDb;
+ if(this.referenceSetID != crDb.getReferenceSetID()){
+ return false;
+ }
+
+ if(! version.equals(crDb.getVersion())){
+ return false;
+ }
}
return true;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java
old mode 100755
new mode 100644
index 4b40c60386..84be7d7142
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java
@@ -45,11 +45,11 @@ import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.events.AutopsyEvent;
import org.sleuthkit.autopsy.ingest.IngestManager;
import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel;
-import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDb;
-import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.CentralRepoHashDb;
+import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.SleuthkitHashSet;
+import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.CentralRepoHashSet;
import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDb.KnownFilesType;
import org.sleuthkit.datamodel.TskCoreException;
-import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDatabase;
+import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDb;
/**
* Instances of this class provide a comprehensive UI for managing the hash sets
@@ -65,7 +65,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
.getMessage(HashLookupSettingsPanel.class, "HashDbConfigPanel.errorGettingIndexStatusText");
private final HashDbManager hashSetManager = HashDbManager.getInstance();
private final HashSetTableModel hashSetTableModel = new HashSetTableModel();
- private final List newReferenceSets = new ArrayList<>();
+ private final List newReferenceSetIDs = new ArrayList<>();
public HashLookupSettingsPanel() {
initComponents();
@@ -108,7 +108,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
}
private void updateComponents() {
- HashDatabase db = ((HashSetTable) hashSetTable).getSelection();
+ HashDb db = ((HashSetTable) hashSetTable).getSelection();
if (db != null) {
updateComponentsForSelection(db);
} else {
@@ -157,7 +157,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
"HashLookupSettingsPanel.notApplicable=N/A",
"HashLookupSettingsPanel.centralRepo=Central Repository"
})
- private void updateComponentsForSelection(HashDatabase db) {
+ private void updateComponentsForSelection(HashDb db) {
boolean ingestIsRunning = IngestManager.getInstance().isIngestRunning();
// Update descriptive labels.
@@ -180,8 +180,8 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
addHashesToDatabaseButton.setEnabled(false);
}
- if(db instanceof HashDb){
- HashDb hashDb = (HashDb)db;
+ if(db instanceof SleuthkitHashSet){
+ SleuthkitHashSet hashDb = (SleuthkitHashSet)db;
// Disable the central repo fields
hashDbVersionLabel.setText(Bundle.HashLookupSettingsPanel_notApplicable());
@@ -253,7 +253,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
indexButton.setEnabled(false);
deleteDatabaseButton.setEnabled(false);
- CentralRepoHashDb crDb = (CentralRepoHashDb)db;
+ CentralRepoHashSet crDb = (CentralRepoHashSet)db;
hashDbVersionLabel.setText(crDb.getVersion());
hashDbOrgLabel.setText(crDb.getOrgName());
@@ -302,15 +302,19 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
@Override
@Messages({"HashLookupSettingsPanel.saveFail.message=Couldn't save hash db settings.",
"HashLookupSettingsPanel.saveFail.title=Save Fail"})
- public void saveSettings() {
+ public void saveSettings() {
+ // Clear out the list of new central repo hash sets. They don't need to be
+ // indexed so will all be saved on both code paths.
+ newReferenceSetIDs.clear();
+
//Checking for for any unindexed databases
- List unindexed = new ArrayList<>();
- for (HashDatabase hashSet : hashSetManager.getAllHashDatabases()) {
- if(hashSet instanceof HashDb){
- HashDb db = (HashDb)hashSet;
+ List unindexed = new ArrayList<>();
+ for (HashDb db : hashSetManager.getAllHashSets()) {
+ if(db instanceof SleuthkitHashSet){
try {
- if (!db.hasIndex()) {
- unindexed.add(db);
+ SleuthkitHashSet hashDatabase = (SleuthkitHashSet)db;
+ if (!hashDatabase.hasIndex()) {
+ unindexed.add(hashDatabase);
}
} catch (TskCoreException ex) {
Logger.getLogger(HashLookupSettingsPanel.class.getName()).log(Level.SEVERE, "Error getting index info for hash database", ex); //NON-NLS
@@ -318,21 +322,28 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
}
}
- //If unindexed ones are found, show a popup box that will either index them, or remove them.
- if (unindexed.size() == 1) {
- showInvalidIndex(false, unindexed);
- } else if (unindexed.size() > 1) {
- showInvalidIndex(true, unindexed);
- }
-
- try {
- hashSetManager.save();
- HashDbManager.getInstance().saveNewCentralRepoDatabases(newReferenceSets);
- newReferenceSets.clear();
- } catch (HashDbManager.HashDbManagerException ex) {
- SwingUtilities.invokeLater(() -> {
- JOptionPane.showMessageDialog(null, Bundle.HashLookupSettingsPanel_saveFail_message(), Bundle.HashLookupSettingsPanel_saveFail_title(), JOptionPane.ERROR_MESSAGE);
+ // If there are unindexed databases, give the user the option to index them now. This
+ // needs to be on the EDT, and will save the hash settings after completing
+ if(! unindexed.isEmpty()){
+ SwingUtilities.invokeLater(new Runnable(){
+ @Override
+ public void run(){
+ //If unindexed ones are found, show a popup box that will either index them, or remove them.
+ if (unindexed.size() == 1) {
+ showInvalidIndex(false, unindexed);
+ } else if (unindexed.size() > 1) {
+ showInvalidIndex(true, unindexed);
+ }
+ }
});
+ } else {
+ try {
+ hashSetManager.save();
+ } catch (HashDbManager.HashDbManagerException ex) {
+ SwingUtilities.invokeLater(() -> {
+ JOptionPane.showMessageDialog(null, Bundle.HashLookupSettingsPanel_saveFail_message(), Bundle.HashLookupSettingsPanel_saveFail_title(), JOptionPane.ERROR_MESSAGE);
+ });
+ }
}
}
@@ -355,10 +366,10 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
*/
if (IngestManager.getInstance().isIngestRunning() == false) {
// Remove any new central repo hash sets from the database
- for(CentralRepoHashDb db:newReferenceSets){
+ for(Integer referenceSetID:newReferenceSetIDs){
try{
if(EamDb.isEnabled()){
- EamDb.getInstance().deleteReferenceSet(db.getReferenceSetID());
+ EamDb.getInstance().deleteReferenceSet(referenceSetID);
} else {
// This is the case where the user imported a database, then switched over to the central
// repo panel and disabled it before cancelling. We can't delete the database at this point.
@@ -368,15 +379,15 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
Logger.getLogger(HashLookupSettingsPanel.class.getName()).log(Level.SEVERE, "Error reverting central repository hash sets", ex); //NON-NLS
}
}
- newReferenceSets.clear();
+ newReferenceSetIDs.clear();
HashDbManager.getInstance().loadLastSavedConfiguration();
}
}
@Messages({"# {0} - hash lookup name", "HashLookupSettingsPanel.removeDatabaseFailure.message=Failed to remove hash lookup: {0}"})
- void removeThese(List toRemove) {
- for (HashDb hashDb : toRemove) {
+ void removeThese(List toRemove) {
+ for (SleuthkitHashSet hashDb : toRemove) {
try {
hashSetManager.removeHashDatabaseNoSave(hashDb);
} catch (HashDbManager.HashDbManagerException ex) {
@@ -394,10 +405,10 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
* @param plural Whether or not there are multiple unindexed databases
* @param unindexed The list of unindexed databases. Can be of size 1.
*/
- private void showInvalidIndex(boolean plural, List unindexed) {
+ private void showInvalidIndex(boolean plural, List unindexed) {
String total = "";
String message;
- for (HashDatabase hdb : unindexed) {
+ for (HashDb hdb : unindexed) {
total += "\n" + hdb.getHashSetName();
}
if (plural) {
@@ -421,6 +432,11 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
"HashDbConfigPanel.allUnindexedDbsRmFromListMsg"));
removeThese(unindexed);
}
+ try {
+ hashSetManager.save();
+ } catch (HashDbManager.HashDbManagerException ex) {
+ JOptionPane.showMessageDialog(null, Bundle.HashLookupSettingsPanel_saveFail_message(), Bundle.HashLookupSettingsPanel_saveFail_title(), JOptionPane.ERROR_MESSAGE);
+ }
}
boolean valid() {
@@ -450,7 +466,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
return cellRenderer;
}
- public HashDatabase getSelection() {
+ public HashDb getSelection() {
return hashSetTableModel.getHashSetAt(getSelectionModel().getMinSelectionIndex());
}
@@ -460,7 +476,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
}
}
- public void selectRowByDatabase(HashDatabase db){
+ public void selectRowByDatabase(HashDb db){
setSelection(hashSetTableModel.getIndexByDatabase(db));
}
@@ -476,7 +492,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
*/
private class HashSetTableModel extends AbstractTableModel {
- List hashSets = HashDbManager.getInstance().getAllHashDatabases();
+ List hashSets = HashDbManager.getInstance().getAllHashSets();
@Override
public int getColumnCount() {
@@ -523,7 +539,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
return getValueAt(0, c).getClass();
}
- HashDatabase getHashSetAt(int index) {
+ HashDb getHashSetAt(int index) {
if (!hashSets.isEmpty() && index >= 0 && index < hashSets.size()) {
return hashSets.get(index);
} else {
@@ -531,7 +547,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
}
}
- int getIndexByDatabase(HashDatabase db){
+ int getIndexByDatabase(HashDb db){
for (int i = 0; i < hashSets.size(); ++i) {
if (hashSets.get(i).equals(db)) {
return i;
@@ -551,7 +567,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
}
void refreshModel() {
- hashSets = HashDbManager.getInstance().refreshAndGetAllHashDatabases();
+ hashSets = HashDbManager.getInstance().getAllHashSets();
refreshDisplay();
}
@@ -915,16 +931,16 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
private void addHashesToDatabaseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addHashesToDatabaseButtonActionPerformed
- HashDatabase hashDb = ((HashSetTable) hashSetTable).getSelection();
+ HashDb hashDb = ((HashSetTable) hashSetTable).getSelection();
AddHashValuesToDatabaseDialog dialog = new AddHashValuesToDatabaseDialog(hashDb);
}//GEN-LAST:event_addHashesToDatabaseButtonActionPerformed
private void createDatabaseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_createDatabaseButtonActionPerformed
- HashDatabase hashDb = new HashDbCreateDatabaseDialog().getHashDatabase();
+ HashDb hashDb = new HashDbCreateDatabaseDialog().getHashDatabase();
if (null != hashDb) {
- if(hashDb instanceof CentralRepoHashDb){
- CentralRepoHashDb crDb = (CentralRepoHashDb)hashDb;
- newReferenceSets.add(crDb);
+ if(hashDb instanceof CentralRepoHashSet){
+ int newDbIndex = ((CentralRepoHashSet)hashDb).getReferenceSetID();
+ newReferenceSetIDs.add(newDbIndex);
}
hashSetTableModel.refreshModel();
@@ -934,7 +950,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
}//GEN-LAST:event_createDatabaseButtonActionPerformed
private void sendIngestMessagesCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_sendIngestMessagesCheckBoxActionPerformed
- HashDatabase hashDb = ((HashSetTable) hashSetTable).getSelection();
+ HashDb hashDb = ((HashSetTable) hashSetTable).getSelection();
if (hashDb != null) {
hashDb.setSendIngestMessages(sendIngestMessagesCheckBox.isSelected());
firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
@@ -942,18 +958,18 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
}//GEN-LAST:event_sendIngestMessagesCheckBoxActionPerformed
private void indexButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_indexButtonActionPerformed
- final HashDatabase hashDatabase = ((HashSetTable) hashSetTable).getSelection();
+ final HashDb hashDatabase = ((HashSetTable) hashSetTable).getSelection();
assert hashDatabase != null;
- assert hashDatabase instanceof HashDb;
+ assert hashDatabase instanceof SleuthkitHashSet;
// Add a listener for the INDEXING_DONE event. This listener will update
// the UI.
- HashDb hashDb = (HashDb)hashDatabase;
+ SleuthkitHashSet hashDb = (SleuthkitHashSet)hashDatabase;
hashDb.addPropertyChangeListener(new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
- if (evt.getPropertyName().equals(HashDb.Event.INDEXING_DONE.toString())) {
- HashDatabase selectedHashDb = ((HashSetTable) hashSetTable).getSelection();
+ if (evt.getPropertyName().equals(SleuthkitHashSet.Event.INDEXING_DONE.toString())) {
+ HashDb selectedHashDb = ((HashSetTable) hashSetTable).getSelection();
if (selectedHashDb != null && hashDb != null && hashDb.equals(selectedHashDb)) {
updateComponents();
}
@@ -974,11 +990,11 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
}//GEN-LAST:event_indexButtonActionPerformed
private void importDatabaseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_importDatabaseButtonActionPerformed
- HashDatabase hashDb = new HashDbImportDatabaseDialog().getHashDatabase();
+ HashDb hashDb = new HashDbImportDatabaseDialog().getHashDatabase();
if (null != hashDb) {
- if(hashDb instanceof CentralRepoHashDb){
- CentralRepoHashDb crDb = (CentralRepoHashDb)hashDb;
- newReferenceSets.add(crDb);
+ if(hashDb instanceof CentralRepoHashSet){
+ int newReferenceSetID = ((CentralRepoHashSet)hashDb).getReferenceSetID();
+ newReferenceSetIDs.add(newReferenceSetID);
}
hashSetTableModel.refreshModel();
@@ -995,7 +1011,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
NbBundle.getMessage(this.getClass(), "HashDbConfigPanel.deleteDbActionMsg"),
JOptionPane.YES_NO_OPTION,
JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION) {
- HashDatabase hashDb = ((HashSetTable) hashSetTable).getSelection();
+ HashDb hashDb = ((HashSetTable) hashSetTable).getSelection();
if (hashDb != null) {
try {
hashSetManager.removeHashDatabaseNoSave(hashDb);
@@ -1010,7 +1026,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
private void hashSetTableKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_hashSetTableKeyPressed
if (evt.getKeyCode() == KeyEvent.VK_DELETE) {
- HashDatabase hashDb = ((HashSetTable) hashSetTable).getSelection();
+ HashDb hashDb = ((HashSetTable) hashSetTable).getSelection();
if (hashDb != null) {
try {
hashSetManager.removeHashDatabaseNoSave(hashDb);
diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ImportCentralRepoDbProgressDialog.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ImportCentralRepoDbProgressDialog.java
index 397b4948cf..880feabcb7 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ImportCentralRepoDbProgressDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ImportCentralRepoDbProgressDialog.java
@@ -39,6 +39,7 @@ import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttribute;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamDbException;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamGlobalFileInstance;
+import org.sleuthkit.autopsy.centralrepository.datamodel.EamGlobalSet;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.datamodel.TskData;
@@ -92,7 +93,7 @@ class ImportCentralRepoDbProgressDialog extends javax.swing.JDialog implements P
this.setVisible(true);
}
- HashDbManager.HashDatabase getDatabase(){
+ HashDbManager.HashDb getDatabase(){
if(worker != null){
return worker.getDatabase();
}
@@ -128,7 +129,7 @@ class ImportCentralRepoDbProgressDialog extends javax.swing.JDialog implements P
void addPropertyChangeListener(PropertyChangeListener dialog);
int getProgressPercentage();
long getLinesProcessed();
- HashDbManager.HashDatabase getDatabase();
+ HashDbManager.HashDb getDatabase();
}
class ImportIDXWorker extends SwingWorker implements CentralRepoImportWorker{
@@ -144,7 +145,7 @@ class ImportCentralRepoDbProgressDialog extends javax.swing.JDialog implements P
private final File importFile;
private final long totalLines;
private int referenceSetID = -1;
- private HashDbManager.CentralRepoHashDb newHashDb = null;
+ private HashDbManager.CentralRepoHashSet newHashDb = null;
private final AtomicLong numLines = new AtomicLong();
ImportIDXWorker(String hashSetName, String version, int orgId,
@@ -176,7 +177,7 @@ class ImportCentralRepoDbProgressDialog extends javax.swing.JDialog implements P
}
@Override
- public HashDbManager.HashDatabase getDatabase(){
+ public HashDbManager.HashDb getDatabase(){
return newHashDb;
}
@@ -201,7 +202,7 @@ class ImportCentralRepoDbProgressDialog extends javax.swing.JDialog implements P
}
// Create an empty hashset in the central repository
- referenceSetID = EamDb.getInstance().newReferenceSet(orgId, hashSetName, version, knownStatus, readOnly);
+ referenceSetID = EamDb.getInstance().newReferenceSet(new EamGlobalSet(orgId, hashSetName, version, knownStatus, readOnly));
EamDb dbManager = EamDb.getInstance();
CorrelationAttribute.Type contentType = dbManager.getCorrelationTypeById(CorrelationAttribute.FILES_TYPE_ID); // get "FILES" type
diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java
index 33f65488d2..41a9fe4fe8 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java
@@ -26,7 +26,7 @@ import java.util.List;
import javax.swing.JOptionPane;
import org.openide.util.NbBundle;
-import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDb;
+import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.SleuthkitHashSet;
/**
* This class exists as a stop-gap measure to force users to have an indexed
@@ -43,8 +43,8 @@ import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDb;
*/
class ModalNoButtons extends javax.swing.JDialog implements PropertyChangeListener {
- List unindexed;
- HashDb toIndex;
+ List unindexed;
+ SleuthkitHashSet toIndex;
HashLookupSettingsPanel hdbmp;
int length = 0;
int currentcount = 1;
@@ -58,7 +58,7 @@ class ModalNoButtons extends javax.swing.JDialog implements PropertyChangeListen
* @param parent Swing parent frame.
* @param unindexed the list of unindexed databases to index.
*/
- ModalNoButtons(HashLookupSettingsPanel hdbmp, java.awt.Frame parent, List unindexed) {
+ ModalNoButtons(HashLookupSettingsPanel hdbmp, java.awt.Frame parent, List unindexed) {
super(parent, NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.indexingDbsTitle"), true);
this.unindexed = unindexed;
this.toIndex = null;
@@ -75,7 +75,7 @@ class ModalNoButtons extends javax.swing.JDialog implements PropertyChangeListen
* @param parent Swing parent frame.
* @param unindexed The unindexed database to index.
*/
- ModalNoButtons(HashLookupSettingsPanel hdbmp, java.awt.Frame parent, HashDb unindexed) {
+ ModalNoButtons(HashLookupSettingsPanel hdbmp, java.awt.Frame parent, SleuthkitHashSet unindexed) {
super(parent, NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.indexingDbTitle"), true);
this.unindexed = null;
this.toIndex = unindexed;
@@ -183,7 +183,7 @@ class ModalNoButtons extends javax.swing.JDialog implements PropertyChangeListen
"ModalNoButtons.dlgTitle.unfinishedIndexing"),
JOptionPane.YES_NO_OPTION);
if (res == JOptionPane.YES_OPTION) {
- List remove = new ArrayList<>();
+ List remove = new ArrayList<>();
if (this.toIndex == null) {
remove = this.unindexed;
} else {
@@ -230,7 +230,7 @@ class ModalNoButtons extends javax.swing.JDialog implements PropertyChangeListen
private void indexThese() {
length = this.unindexed.size();
this.INDEXING_PROGBAR.setIndeterminate(true);
- for (HashDb db : this.unindexed) {
+ for (SleuthkitHashSet db : this.unindexed) {
currentDb = db.getHashSetName();
this.CURRENTDB_LABEL.setText("(" + currentDb + ")");
this.CURRENTLYON_LABEL.setText(
@@ -255,7 +255,7 @@ class ModalNoButtons extends javax.swing.JDialog implements PropertyChangeListen
* this dialog if all indexing is complete.
*/
public void propertyChange(PropertyChangeEvent evt) {
- if (evt.getPropertyName().equals(HashDb.Event.INDEXING_DONE.name())) {
+ if (evt.getPropertyName().equals(SleuthkitHashSet.Event.INDEXING_DONE.name())) {
if (currentcount >= length) {
this.INDEXING_PROGBAR.setValue(100);
this.setModal(false);
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDb.java b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDb.java
index 233aad0202..1de1db7eaa 100755
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDb.java
+++ b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDb.java
@@ -27,6 +27,7 @@ import javax.swing.JPanel;
import org.openide.util.lookup.ServiceProvider;
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.casemodule.services.TagsManager;
+import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDb;
import org.sleuthkit.autopsy.report.GeneralReportModule;
import org.sleuthkit.autopsy.report.ReportProgressPanel;
import org.sleuthkit.datamodel.AbstractFile;
@@ -34,7 +35,6 @@ import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.ContentTag;
import org.sleuthkit.datamodel.TagName;
import org.sleuthkit.datamodel.TskCoreException;
-import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDatabase;
/**
* Instances of this class plug in to the reporting infrastructure to provide a
@@ -69,7 +69,7 @@ public class AddTaggedHashesToHashDb implements GeneralReportModule {
progressPanel.start();
progressPanel.updateStatusLabel("Adding hashes...");
- HashDatabase hashSet = configPanel.getSelectedHashDatabase();
+ HashDb hashSet = configPanel.getSelectedHashDatabase();
if (hashSet != null) {
progressPanel.updateStatusLabel("Adding hashes to " + hashSet.getHashSetName() + " hash set...");
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form
index 20cec74d82..dfe9ba921e 100755
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form
@@ -124,7 +124,7 @@