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

Merge pull request #7474 from sleuthkit/develop

Browse Source 
Merge develop
This commit is contained in:
Ann Priestman 2021-12-16 11:33:31 -05:00 committed by GitHub
commit 8cf0dae472
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
View File

@ -359,21 +359,30 @@ public class IngestManager implements IngestProgressSnapshotProvider {
* artifact will be analyzed. It also might be analyzed by a
* subsequent ingest job for the data source. This is an
* acceptable edge case.
*
* 5. The user can manually run ad hoc keyword searches,
* which post TSK_KEYWORD_HIT analysis results. Ingest
* of that data source might be running, in which case the analysis
* results will be analyzed. They also might be analyzed by a
* subsequent ingest job for the data source. This is an
* acceptable edge case.
*/
DataArtifact dataArtifact = newDataArtifacts.get(0);
try {
Content artifactDataSource = dataArtifact.getDataSource();
synchronized (ingestJobsById) {
for (IngestJob job : ingestJobsById.values()) {
Content dataSource = job.getDataSource();
if (artifactDataSource.getId() == dataSource.getId()) {
ingestJob = job;
break;
BlackboardArtifact artifact = newArtifacts.iterator().next();
if (artifact != null) {
try {
Content artifactDataSource = artifact.getDataSource();
synchronized (ingestJobsById) {
for (IngestJob job : ingestJobsById.values()) {
Content dataSource = job.getDataSource();
if (artifactDataSource.getId() == dataSource.getId()) {
ingestJob = job;
break;
}
}
}
} catch (TskCoreException ex) {
logger.log(Level.SEVERE, String.format("Failed to get data source for blackboard artifact (object ID = %d)", artifact.getId()), ex); //NON-NLS
}
} catch (TskCoreException ex) {
logger.log(Level.SEVERE, String.format("Failed to get data source for data artifact (object ID = %d)", dataArtifact.getId()), ex); //NON-NLS
}
}
if (ingestJob != null) {

3
RecentActivity/src/org/sleuthkit/autopsy/recentactivity/DefaultDomainCategorizer.java
View File

@ -56,6 +56,7 @@ import org.sleuthkit.autopsy.url.analytics.DomainCategory;
@SuppressWarnings("try")
public class DefaultDomainCategorizer implements DomainCategorizer {
private static final String COMMENT_PREFIX = "#";
private static final String CSV_DELIMITER = ",";
private static final String DOMAIN_TYPE_CSV = "default_domain_categories.csv"; //NON-NLS
private static final Logger logger = Logger.getLogger(DefaultDomainCategorizer.class.getName());
@ -76,7 +77,7 @@ public class DefaultDomainCategorizer implements DomainCategorizer {
int lineNum = 1;
while (reader.ready()) {
String line = reader.readLine();
if (!StringUtils.isBlank(line)) {
if (!StringUtils.isBlank(line) && !line.startsWith(COMMENT_PREFIX)) {
addItem(mapping, line.trim(), lineNum);
lineNum++;
}

9
RecentActivity/src/org/sleuthkit/autopsy/recentactivity/default_domain_categories.csv
View File

@ -1,3 +1,12 @@
#
# This file was compiled from multiple sources.
# Web Mail: https://github.com/mailcheck/mailcheck/wiki/List-of-Popular-Domains
# Disposable Mail: https://www.npmjs.com/package/disposable-email-domains
# Messaging: https://www.raymond.cc/blog/list-of-web-messengers-for-your-convenience/
#
#
#
#
icq.com,Messaging
webmessenger.yahoo.com,Messaging
talk.google.com,Messaging

Can't render this file because it is too large.