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

refactored builder to use nicer abstraction

Browse Source
This commit is contained in:
Brian Sweeney 2018-04-09 08:49:12 -06:00
parent 33e904b80c
commit bcfa75c5f9
2 changed files with 63 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaDataBuilder.java
View File

@ -35,21 +35,17 @@ import org.sleuthkit.datamodel.TskCoreException;
/**
*
* Generates a List<CommonFilesMetaData> when collateFiles() is called, which organizes
* AbstractFiles by md5 to prepare to display in viewer.
* Generates a List<CommonFilesMetaData> when collateFiles() is called, which
* organizes AbstractFiles by md5 to prepare to display in viewer.
*
* This entire thing runs on a background thread where exceptions are handled.
*/
class CommonFilesMetaDataBuilder {
abstract class CommonFilesMetaDataBuilder {
private final Long selectedDataSourceId;
private final Map<Long, String> dataSourceIdToNameMap;
//TODO subclass this class to specify where clause and/or additional algorithms.
private final String singleDataSourceWhereClause = "md5 in (select md5 from tsk_files where data_source_obj_id=%s and (known != 1 OR known IS NULL) GROUP BY md5 HAVING COUNT(*) > 1) AND data_source_obj_id=%s order by md5";
private final String allDataSourcesWhereClause = "md5 in (select md5 from tsk_files where (known != 1 OR known IS NULL) GROUP BY md5 HAVING COUNT(*) > 1) order by md5";
CommonFilesMetaDataBuilder(Long dataSourceId, Map<Long, String> dataSourceIdMap) {
selectedDataSourceId = dataSourceId;
CommonFilesMetaDataBuilder(Map<Long, String> dataSourceIdMap) {
dataSourceIdToNameMap = dataSourceIdMap;
}
@ -86,6 +82,13 @@ class CommonFilesMetaDataBuilder {
return metaDataModels;
}
/**
* Should build a SQL WHERE clause to be passed to SleuthkitCase.findAllFilesWhere(sql)
* which will select the desired common files ordered by MD5.
* @return sql string where clause
*/
protected abstract String buildSqlWhereClause();
private void collateParentChildRelationships(List<AbstractFile> files, Map<String, List<AbstractFile>> parentNodes, Map<String, Set<String>> md5ToDataSourcesStringMap) {
for (AbstractFile file : files) {
@ -112,13 +115,40 @@ class CommonFilesMetaDataBuilder {
private List<AbstractFile> findCommonFiles() throws TskCoreException, NoCurrentCaseException {
SleuthkitCase sleuthkitCase;
sleuthkitCase = Case.getOpenCase().getSleuthkitCase();
String whereClause = allDataSourcesWhereClause;
if (selectedDataSourceId != 0L) {
Object[] args = new String[]{Long.toString(selectedDataSourceId), Long.toString(selectedDataSourceId)};
whereClause = String.format(singleDataSourceWhereClause, args);
}
String whereClause = this.buildSqlWhereClause();
List<AbstractFile> files = sleuthkitCase.findAllFilesWhere(whereClause);
return files;
}
}
class SingleDataSource extends CommonFilesMetaDataBuilder {
private static final String allDataSourcesWhereClause = "md5 in (select md5 from tsk_files where (known != 1 OR known IS NULL) GROUP BY md5 HAVING COUNT(*) > 1) order by md5";
private final Long selectedDataSourceId;
public SingleDataSource(Long dataSourceId, Map<Long, String> dataSourceIdMap) {
super(dataSourceIdMap);
this.selectedDataSourceId = dataSourceId;
}
@Override
protected String buildSqlWhereClause() {
Object[] args = new String[]{Long.toString(this.selectedDataSourceId), Long.toString(this.selectedDataSourceId)};
return String.format(SingleDataSource.allDataSourcesWhereClause, args);
}
}
class AllDataSources extends CommonFilesMetaDataBuilder {
private static final String singleDataSourceWhereClause = "md5 in (select md5 from tsk_files where data_source_obj_id=%s and (known != 1 OR known IS NULL) GROUP BY md5 HAVING COUNT(*) > 1) AND data_source_obj_id=%s order by md5";
public AllDataSources(Map<Long, String> dataSourceIdMap) {
super(dataSourceIdMap);
}
@Override
protected String buildSqlWhereClause() {
return AllDataSources.singleDataSourceWhereClause;
}
}

17
Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
View File

@ -52,6 +52,8 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
private static final long serialVersionUID = 1L;
public static final Long NO_DATA_SOURCE_SELECTED = -1L;
private ComboBoxModel<String> dataSourcesList = new DataSourceComboBoxModel();
private Map<Long, String> dataSourceMap;
@ -182,7 +184,7 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
new SwingWorker<List<CommonFilesMetaData>, Void>() {
private Long determineDataSourceId() {
Long selectedObjId = 0L;
Long selectedObjId = CommonFilesPanel.NO_DATA_SOURCE_SELECTED;
if (CommonFilesPanel.this.singleDataSource) {
for (Entry<Long, String> dataSource : CommonFilesPanel.this.dataSourceMap.entrySet()) {
if (dataSource.getValue().equals(CommonFilesPanel.this.selectedDataSource)) {
@ -196,8 +198,17 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
@Override
protected List<CommonFilesMetaData> doInBackground() throws TskCoreException, NoCurrentCaseException, SQLException {
Long selectedObjId = determineDataSourceId();
return new CommonFilesMetaDataBuilder(selectedObjId, CommonFilesPanel.this.dataSourceMap).collateFiles();
Long dataSourceId = determineDataSourceId();
CommonFilesMetaDataBuilder builder;
if (dataSourceId == CommonFilesPanel.NO_DATA_SOURCE_SELECTED) {
builder = new AllDataSources(dataSourceMap);
} else {
builder = new SingleDataSource(dataSourceId, dataSourceMap);
}
return builder.collateFiles();
}
@Override