codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-10-05 00:36:16 +00:00
Code Issues Releases Wiki Activity

Revert changes to the public api

Browse Source
This commit is contained in:
Ann Priestman
2017-11-13 08:47:01 -05:00
parent 055c095a56
commit 56c5cd92cb
6 changed files with 31 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbCreateDatabaseDialog.java
+1 -1
View File
@@ -338,7 +338,7 @@ final class HashDbCreateDatabaseDialog extends javax.swing.JDialog {
String errorMessage = NbBundle
.getMessage(this.getClass(), "HashDbCreateDatabaseDialog.errMsg.hashDbCreationErr");
try {
newHashDb = HashDbManager.getInstance().addNewFileTypeHashDatabase(hashSetNameTextField.getText(), fileChooser.getSelectedFile().getCanonicalPath(), true, sendIngestMessagesCheckbox.isSelected(), type);
newHashDb = HashDbManager.getInstance().addNewHashDatabaseNoSave(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,
Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbImportDatabaseDialog.java
+1 -1
View File
@@ -514,7 +514,7 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
if(fileTypeRadioButton.isSelected()){
try {
selectedHashDb = HashDbManager.getInstance().addExistingFileTypeHashDatabase(hashSetNameTextField.getText(), selectedFilePath, true, sendIngestMessagesCheckbox.isSelected(), type);
selectedHashDb = HashDbManager.getInstance().addExistingHashDatabaseNoSave(hashSetNameTextField.getText(), selectedFilePath, true, sendIngestMessagesCheckbox.isSelected(), type);
} catch (HashDbManagerException ex) {
Logger.getLogger(HashDbImportDatabaseDialog.class.getName()).log(Level.WARNING, errorMessage, ex);
JOptionPane.showMessageDialog(this,
Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java
+19 -43
View File
@@ -147,7 +147,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);
@@ -155,12 +154,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()) {
@@ -175,7 +169,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 = addFileHashDatabase(SleuthkitJNI.openHashDatabase(path), hashSetName, searchDuringIngest, sendIngestMessages, knownFilesType);
} catch (TskCoreException ex) {
throw new HashDbManagerException(ex.getMessage());
}
@@ -200,7 +194,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 {
@@ -212,14 +205,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);
@@ -239,14 +226,14 @@ 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 = addFileHashDatabase(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 HashDb addFileHashDatabase(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);
@@ -281,7 +268,7 @@ public class HashDbManager implements PropertyChangeListener {
return hashDb;
}
public CentralRepoHashDb addExistingCentralRepoHashSet(String hashSetName, String version, int referenceSetID,
CentralRepoHashDb addExistingCentralRepoHashSet(String hashSetName, String version, int referenceSetID,
boolean searchDuringIngest, boolean sendIngestMessages, HashDb.KnownFilesType knownFilesType,
boolean readOnly) throws TskCoreException{
@@ -414,23 +401,22 @@ public class HashDbManager implements PropertyChangeListener {
}
/**
* Gets all of the hash databases used to classify files as known or known
* bad.
* Gets all of the HashDbs used to classify files as known or known
* bad. Will not return central repository databases.
*
* @return A list, possibly empty, of hash databases.
*/
@Deprecated
public synchronized List<HashDb> getAllHashSets() {
return getAllFileTypeHashSets();
return getAllFileHashSets();
}
/**
* Gets all of the file type hash databases used to classify files as known or known
* Gets all of the file hash databases used to classify files as known or known
* bad.
*
* @return A list, possibly empty, of hash databases.
*/
public synchronized List<HashDb> getAllFileTypeHashSets() {
synchronized List<HashDb> getAllFileHashSets() {
List<HashDb> hashDbs = new ArrayList<>();
this.hashSets.stream().filter((thisSet) -> (thisSet instanceof HashDb)).forEach((thisSet) -> {
hashDbs.add((HashDb)thisSet);
@@ -440,28 +426,21 @@ public class HashDbManager implements PropertyChangeListener {
/**
* 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.
*/
public synchronized List<HashDatabase> getAllHashDatabases(){
List<HashDatabase> 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<HashDatabase> refreshAndGetAllHashDatabases(){
synchronized List<HashDatabase> getAllHashDatabases(){
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<HashDatabase> hashDbs = new ArrayList<>();
hashDbs.addAll(this.hashSets);
return hashDbs;
}
/**
@@ -469,7 +448,6 @@ public class HashDbManager implements PropertyChangeListener {
*
* @return A list, possibly empty, of hash databases.
*/
@Deprecated
public synchronized List<HashDb> getKnownFileHashSets() {
List<HashDb> hashDbs = new ArrayList<>();
this.hashSets.stream().filter((thisSet) -> ((thisSet instanceof HashDb) && (thisSet.getKnownFilesType() == HashDb.KnownFilesType.KNOWN))).forEach((thisSet) -> {
@@ -483,7 +461,7 @@ public class HashDbManager implements PropertyChangeListener {
*
* @return A list, possibly empty, of hash databases.
*/
public synchronized List<HashDatabase> getKnownFileHashDatabases() {
synchronized List<HashDatabase> getKnownFileHashDatabases() {
List<HashDatabase> hashDbs = new ArrayList<>();
this.hashSets.stream().filter((db) -> (db.getKnownFilesType() == HashDb.KnownFilesType.KNOWN)).forEach((db) -> {
hashDbs.add(db);
@@ -496,7 +474,6 @@ public class HashDbManager implements PropertyChangeListener {
*
* @return A list, possibly empty, of hash databases.
*/
@Deprecated
public synchronized List<HashDb> getKnownBadFileHashSets() {
List<HashDb> hashDbs = new ArrayList<>();
this.hashSets.stream().filter((thisSet) -> ((thisSet instanceof HashDb) && (thisSet.getKnownFilesType() == HashDb.KnownFilesType.KNOWN_BAD))).forEach((thisSet) -> {
@@ -510,7 +487,7 @@ public class HashDbManager implements PropertyChangeListener {
*
* @return A list, possibly empty, of hash databases.
*/
public synchronized List<HashDatabase> getNotableFileHashDatabases() {
synchronized List<HashDatabase> getNotableFileHashDatabases() {
List<HashDatabase> hashDbs = new ArrayList<>();
this.hashSets.stream().filter((db) -> (db.getKnownFilesType() == HashDb.KnownFilesType.KNOWN_BAD)).forEach((db) -> {
hashDbs.add(db);
@@ -523,7 +500,6 @@ public class HashDbManager implements PropertyChangeListener {
*
* @return A list, possibly empty, of hash databases.
*/
@Deprecated
public synchronized List<HashDb> getUpdateableHashSets() {
List<HashDb> updateableDbs = new ArrayList<>();
List<HashDatabase> updateableHashSets = getUpdateableHashSets(this.hashSets);
@@ -625,7 +601,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());
addFileHashDatabase(SleuthkitJNI.openHashDatabase(dbPath), hashDbInfo.getHashSetName(), hashDbInfo.getSearchDuringIngest(), hashDbInfo.getSendIngestMessages(), hashDbInfo.getKnownFilesType());
} else {
logger.log(Level.WARNING, Bundle.HashDbManager_noDbPath_message(hashDbInfo.getHashSetName()));
allDatabasesLoadedCorrectly = false;
Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleFactory.java
+1 -1
View File
@@ -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().getAllHashDatabases());
}
@Override
Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java
+7 -11
View File
@@ -27,7 +27,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JTable;
import javax.swing.ListSelectionModel;
@@ -306,16 +305,13 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
public void saveSettings() {
//Checking for for any unindexed databases
List<HashDb> unindexed = new ArrayList<>();
for (HashDatabase hashSet : hashSetManager.getAllHashDatabases()) {
if(hashSet instanceof HashDb){
HashDb db = (HashDb)hashSet;
try {
if (!db.hasIndex()) {
unindexed.add(db);
}
} catch (TskCoreException ex) {
Logger.getLogger(HashLookupSettingsPanel.class.getName()).log(Level.SEVERE, "Error getting index info for hash database", ex); //NON-NLS
for (HashDb db : hashSetManager.getAllFileHashSets()) {
try {
if (!db.hasIndex()) {
unindexed.add(db);
}
} catch (TskCoreException ex) {
Logger.getLogger(HashLookupSettingsPanel.class.getName()).log(Level.SEVERE, "Error getting index info for hash database", ex); //NON-NLS
}
}
@@ -550,7 +546,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
}
void refreshModel() {
hashSets = HashDbManager.getInstance().refreshAndGetAllHashDatabases();
hashSets = HashDbManager.getInstance().getAllHashDatabases();
refreshDisplay();
}
Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java
+2 -2
View File
@@ -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<HashDbManager.HashDb> hashDbs = HashDbManager.getInstance().getAllFileTypeHashSets();
List<HashDbManager.HashDb> hashDbs = HashDbManager.getInstance().getAllHashSets();
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.getAllFileTypeHashSets()) {
for (HashDb hashDb : hashDbManager.getAllHashSets()) {
if (hashDb.hasIndexOnly()) {
results.add(hashDb.getIndexPath());
} else {