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

Added TagName and TagSet events

Browse Source
This commit is contained in:
Kelly Kelly 2021-07-23 10:07:42 -04:00
parent 847b83d260
commit cc7cbe8a94
7 changed files with 343 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Core/src/org/sleuthkit/autopsy/casemodule/Case.java
View File

@ -98,6 +98,11 @@ import org.sleuthkit.autopsy.casemodule.events.PersonsAddedEvent;
import org.sleuthkit.autopsy.casemodule.events.PersonsUpdatedEvent;
import org.sleuthkit.autopsy.casemodule.events.PersonsDeletedEvent;
import org.sleuthkit.autopsy.casemodule.events.ReportAddedEvent;
import org.sleuthkit.autopsy.casemodule.events.TagNamesEvent.TagNamesAddedEvent;
import org.sleuthkit.autopsy.casemodule.events.TagNamesEvent.TagNamesDeletedEvent;
import org.sleuthkit.autopsy.casemodule.events.TagNamesEvent.TagNamesUpdatedEvent;
import org.sleuthkit.autopsy.casemodule.events.TagSetsEvent.TagSetsAddedEvent;
import org.sleuthkit.autopsy.casemodule.events.TagSetsEvent.TagSetsDeletedEvent;
import org.sleuthkit.autopsy.casemodule.multiusercases.CaseNodeData.CaseNodeDataException;
import org.sleuthkit.autopsy.casemodule.multiusercases.CoordinationServiceUtils;
import org.sleuthkit.autopsy.casemodule.services.Services;
@ -484,7 +489,32 @@ public class Case {
/**
* One or more hosts have been removed from a person.
*/
HOSTS_REMOVED_FROM_PERSON;
HOSTS_REMOVED_FROM_PERSON,
/**
* One or more TagNames have been added.
*/
TAG_NAMES_ADDED,
/**
* One or more TagNames have been updated.
*/
TAG_NAMES_UPDATED,
/**
* One or more TagNames have been deleted.
*/
TAG_NAMES_DELETED,
/**
* One or more TagSets have been added.
*/
TAG_SETS_ADDED,
/**
* One or more TagSets have been removed.
*/
TAG_SETS_DELETED;
};
@ -628,6 +658,30 @@ public class Case {
eventPublisher.publish(new HostsRemovedFromPersonEvent(event.getPerson(), event.getHostIds()));
}
@Subscribe
public void publicTagNamesAdded(TskEvent.TagNamesAddedTskEvent event) {
eventPublisher.publish(new TagNamesAddedEvent(event.getTagNames()));
}
@Subscribe
public void publicTagNamesUpdated(TskEvent.TagNamesUpdatedTskEvent event) {
eventPublisher.publish(new TagNamesUpdatedEvent(event.getTagNames()));
}
@Subscribe
public void publicTagNamesDeleted(TskEvent.TagNamesDeletedTskEvent event) {
eventPublisher.publish(new TagNamesDeletedEvent(event.getTagNameIds()));
}
@Subscribe
public void publicTagSetsAdded(TskEvent.TagSetsAddedTskEvent event) {
eventPublisher.publish(new TagSetsAddedEvent(event.getTagSets()));
}
@Subscribe
public void publicTagSetsDeleted(TskEvent.TagSetsDeletedTskEvent event) {
eventPublisher.publish(new TagSetsDeletedEvent(event.getTagSetIds()));
}
}
/**

126
Core/src/org/sleuthkit/autopsy/casemodule/events/TagNamesEvent.java Executable file
View File

@ -0,0 +1,126 @@
/*
* Autopsy Forensic Browser
*
* Copyright 2021 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.sleuthkit.autopsy.casemodule.events;
import java.util.ArrayList;
import java.util.List;
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.datamodel.SleuthkitCase;
import org.sleuthkit.datamodel.TagName;
import org.sleuthkit.datamodel.TaggingManager;
import org.sleuthkit.datamodel.TskCoreException;
/**
* A base class for TagName added and update events.
*/
public class TagNamesEvent extends TskDataModelChangedEvent<TagName, TagName> {
private static final long serialVersionUID = 1L;
/**
* Construct the base event for TagNames that have been added or updated.
*
* @param eventName The name of the event.
* @param tagNames The TagNames that have been modified.
*/
private TagNamesEvent(String eventName, List<TagName> tagNames) {
super(eventName, null, null, tagNames, TagName::getId);
}
/**
* Returns a list of the added or modified TagNames.
*
* @return The event list of TagNames.
*/
public List<TagName> getTagNames() {
return getNewValue();
}
@Override
protected List<TagName> getNewValueObjects(SleuthkitCase caseDb, List<Long> ids) throws TskCoreException {
List<TagName> tagNames = new ArrayList<>();
TaggingManager taggingMrg = caseDb.getTaggingManager();
for (Long id : ids) {
tagNames.add(taggingMrg.getTagName(id));
}
return tagNames;
}
/**
* Application events published when TagNames have been Added from the
* Sleuth Kit data model for a case.
*/
public static class TagNamesAddedEvent extends TagNamesEvent {
private static final long serialVersionUID = 1L;
/**
* Construct an application event published when TagNames have been
* added to the Sleuth Kit data model.
*
* @param tagNames The TagNames that have been added.
*/
public TagNamesAddedEvent(List<TagName> tagNames) {
super(Case.Events.TAG_NAMES_ADDED.name(), tagNames);
}
}
/**
* Application events published when TagNames have been updated from the
* Sleuth Kit data model for a case.
*/
public static class TagNamesUpdatedEvent extends TagNamesEvent {
private static final long serialVersionUID = 1L;
/**
* Construct an application event published when TagNames have been
* updated in the Sleuth Kit data model.
*
* @param tagNames The TagNames that have been updated.
*/
public TagNamesUpdatedEvent(List<TagName> tagNames) {
super(Case.Events.TAG_NAMES_UPDATED.name(), tagNames);
}
}
/**
* Application events published when TagNames have been deleted from the
* Sleuth Kit data model for a case.
*/
public static class TagNamesDeletedEvent extends TskDataModelObjectsDeletedEvent {
private static final long serialVersionUID = 1L;
/**
* Constructs an application event published when the TagNames have been
* deleted from the Sleuth Kit data model for a case.
*
* @param tagNameIds The IDs of the TagNames that have been deleted.
*/
public TagNamesDeletedEvent(List<Long> tagNameIds) {
super(Case.Events.TAG_NAMES_DELETED.name(), tagNameIds);
}
public List<Long> getTagNameIds() {
return getOldValue();
}
}
}

103
Core/src/org/sleuthkit/autopsy/casemodule/events/TagSetsEvent.java Executable file
View File

@ -0,0 +1,103 @@
/*
* Autopsy Forensic Browser
*
* Copyright 2021 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.sleuthkit.autopsy.casemodule.events;
import java.util.ArrayList;
import java.util.List;
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.datamodel.SleuthkitCase;
import org.sleuthkit.datamodel.TagSet;
import org.sleuthkit.datamodel.TaggingManager;
import org.sleuthkit.datamodel.TskCoreException;
/**
* A base class for TagSet added and update events.
*/
public class TagSetsEvent extends TskDataModelChangedEvent<TagSet, TagSet> {
private static final long serialVersionUID = 1L;
/**
* Construct a new TagSetEvent.
*
* @param eventName
* @param tagSets
*/
private TagSetsEvent(String eventName, List<TagSet> tagSets) {
super(eventName, null, null, tagSets, TagSet::getId);
}
/**
* Returns a list of the TagSet objects that were added or modified for this
* event.
*
* @return A list of TagSet objects.
*/
public List<TagSet> getTagSets() {
return this.getNewValue();
}
@Override
protected List<TagSet> getNewValueObjects(SleuthkitCase caseDb, List<Long> ids) throws TskCoreException {
List<TagSet> tagSets = new ArrayList<>();
TaggingManager taggingMrg = caseDb.getTaggingManager();
for (Long id : ids) {
tagSets.add(taggingMrg.getTagSet(id));
}
return tagSets;
}
/**
* Application events published when TagSets have been Added from the Sleuth
* Kit data model for a case.
*/
public static class TagSetsAddedEvent extends TagSetsEvent {
private static final long serialVersionUID = 1L;
/**
* Construct an application event published when TagSetss have been
* added to the Sleuth Kit data model.
*
* @param tagSets The TagSets that have been added.
*/
public TagSetsAddedEvent(List<TagSet> tagSets) {
super(Case.Events.TAG_SETS_ADDED.name(), tagSets);
}
}
/**
* Application events published when TagSets have been deleted from the
* Sleuth Kit data model for a case.
*/
public static class TagSetsDeletedEvent extends TskDataModelObjectsDeletedEvent {
private static final long serialVersionUID = 1L;
/**
* Constructs an application event published when the TagSets have been
* deleted from the Sleuth Kit data model for a case.
*
* @param tagNameIds The IDs of the TagNames that have been deleted.
*/
public TagSetsDeletedEvent(List<Long> tagNameIds) {
super(Case.Events.TAG_SETS_DELETED.name(), tagNameIds);
}
}
}

2
Core/src/org/sleuthkit/autopsy/casemodule/services/TagNameDefinition.java
View File

@ -236,7 +236,7 @@ final public class TagNameDefinition implements Comparable<TagNameDefinition> {
TagName saveToCase(SleuthkitCase caseDb) {
TagName tagName = null;
try {
tagName = caseDb.addOrUpdateTagName(displayName, description, color, knownStatus);
tagName = caseDb.getTaggingManager().addOrUpdateTagName(displayName, description, color, knownStatus);
} catch (TskCoreException ex) {
LOGGER.log(Level.SEVERE, "Error saving tag name definition", ex);
}

68
Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java
View File

@ -18,9 +18,12 @@
*/
package org.sleuthkit.autopsy.casemodule.services;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.Closeable;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
@ -29,8 +32,11 @@ import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import org.openide.util.NbBundle;
import org.openide.util.WeakListeners;
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
import org.sleuthkit.autopsy.casemodule.events.TagNamesEvent;
import org.sleuthkit.autopsy.casemodule.events.TagNamesEvent.TagNamesDeletedEvent;
import org.sleuthkit.autopsy.casemodule.services.contentviewertags.ContentViewerTagManager;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.datamodel.BlackboardArtifact;
@ -61,6 +67,37 @@ public class TagsManager implements Closeable {
private static final Object lock = new Object();
private final Map<String, TagName> allTagNameMap = Collections.synchronizedMap(new HashMap<>());
private final PropertyChangeListener listener = new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(Case.Events.TAG_NAMES_ADDED.name())
|| evt.getPropertyName().equals(Case.Events.TAG_NAMES_UPDATED.name())) {
TagNamesEvent tagEvent = (TagNamesEvent) evt;
List<TagName> addTagNames = tagEvent.getTagNames();
for (TagName tag : addTagNames) {
allTagNameMap.put(tag.getDisplayName(), tag);
}
} else if (evt.getPropertyName().equals(Case.Events.TAG_NAMES_DELETED.name())) {
TagNamesDeletedEvent tagEvent = (TagNamesDeletedEvent) evt;
List<Long> deletedIds = tagEvent.getTagNameIds();
List<String> keysToRemove = new ArrayList<>();
for (TagName tagName : getAllTagNames()) {
if (deletedIds.contains(tagName.getId())) {
keysToRemove.add(tagName.getDisplayName());
}
}
for (String key : keysToRemove) {
allTagNameMap.remove(key);
}
}
}
};
private final PropertyChangeListener weakListener = WeakListeners.propertyChange(listener, null);
static {
//Create the contentviewer tags table if the current case does not
@ -177,8 +214,6 @@ public class TagsManager implements Closeable {
/*
* No current case, nothing more to add to the set.
*/
} catch (TskCoreException ex) {
LOGGER.log(Level.SEVERE, "Failed to get list of TagNames from TagsManager.", ex);
}
return tagDisplayNames;
}
@ -268,14 +303,14 @@ public class TagsManager implements Closeable {
// add the standard tag names
for (TagNameDefinition def : TagNameDefinition.getStandardTagNameDefinitions()) {
caseDb.addOrUpdateTagName(def.getDisplayName(), def.getDescription(), def.getColor(), def.getKnownStatus());
taggingMgr.addOrUpdateTagName(def.getDisplayName(), def.getDescription(), def.getColor(), def.getKnownStatus());
}
//Assume new case and add all tag sets
for (TagSetDefinition setDef : TagSetDefinition.readTagSetDefinitions()) {
List<TagName> tagNamesInSet = new ArrayList<>();
for (TagNameDefinition tagNameDef : setDef.getTagNameDefinitions()) {
tagNamesInSet.add(caseDb.addOrUpdateTagName(tagNameDef.getDisplayName(), tagNameDef.getDescription(), tagNameDef.getColor(), tagNameDef.getKnownStatus()));
tagNamesInSet.add(taggingMgr.addOrUpdateTagName(tagNameDef.getDisplayName(), tagNameDef.getDescription(), tagNameDef.getColor(), tagNameDef.getKnownStatus()));
}
if (!tagNamesInSet.isEmpty()) {
@ -283,6 +318,11 @@ public class TagsManager implements Closeable {
}
}
}
for(TagName tagName: caseDb.getAllTagNames()) {
allTagNameMap.put(tagName.getDisplayName(), tagName);
}
} catch (TskCoreException ex) {
LOGGER.log(Level.SEVERE, "Error updating standard tag name and tag set definitions", ex);
} catch (IOException ex) {
@ -292,6 +332,10 @@ public class TagsManager implements Closeable {
for (TagNameDefinition tagName : TagNameDefinition.getTagNameDefinitions()) {
tagName.saveToCase(caseDb);
}
Case.addEventTypeSubscriber(Collections.singleton(Case.Events.TAG_NAMES_UPDATED), weakListener);
Case.addEventTypeSubscriber(Collections.singleton(Case.Events.TAG_NAMES_ADDED), weakListener);
Case.addEventTypeSubscriber(Collections.singleton(Case.Events.TAG_NAMES_DELETED), weakListener);
}
/**
@ -337,11 +381,12 @@ public class TagsManager implements Closeable {
* Gets a list of all tag names currently in the case database.
*
* @return A list, possibly empty, of TagName objects.
*
* @throws TskCoreException If there is an error querying the case database.
*/
public List<TagName> getAllTagNames() throws TskCoreException {
return caseDb.getAllTagNames();
public synchronized List<TagName> getAllTagNames() {
List<TagName> tagNames = new ArrayList<>();
tagNames.addAll(allTagNameMap.values());
return tagNames;
}
/**
@ -439,7 +484,7 @@ public class TagsManager implements Closeable {
*/
public Map<String, TagName> getDisplayNamesToTagNamesMap() throws TskCoreException {
Map<String, TagName> tagNames = new HashMap<>();
for (TagName tagName : caseDb.getAllTagNames()) {
for (TagName tagName : getAllTagNames()) {
tagNames.put(tagName.getDisplayName(), tagName);
}
return tagNames;
@ -521,13 +566,13 @@ public class TagsManager implements Closeable {
public TagName addTagName(String displayName, String description, TagName.HTML_COLOR color, TskData.FileKnown knownStatus) throws TagNameAlreadyExistsException, TskCoreException {
synchronized (lock) {
try {
TagName tagName = caseDb.addOrUpdateTagName(displayName, description, color, knownStatus);
TagName tagName = caseDb.getTaggingManager().addOrUpdateTagName(displayName, description, color, knownStatus);
Set<TagNameDefinition> customTypes = TagNameDefinition.getTagNameDefinitions();
customTypes.add(new TagNameDefinition(displayName, description, color, knownStatus));
TagNameDefinition.setTagNameDefinitions(customTypes);
return tagName;
} catch (TskCoreException ex) {
List<TagName> existingTagNames = caseDb.getAllTagNames();
List<TagName> existingTagNames = getAllTagNames();
for (TagName tagName : existingTagNames) {
if (tagName.getDisplayName().equals(displayName)) {
throw new TagNameAlreadyExistsException();
@ -1039,5 +1084,4 @@ public class TagsManager implements Closeable {
@Override
public void close() throws IOException {
}
}

2
Core/src/org/sleuthkit/autopsy/report/modules/portablecase/PortableCaseReportModule.java
View File

@ -340,7 +340,7 @@ public class PortableCaseReportModule implements ReportModule {
progressPanel.updateStatusLabel(Bundle.PortableCaseReportModule_generateReport_copyingTags());
try {
for (TagName tagName : tagNames) {
TagName newTagName = portableSkCase.addOrUpdateTagName(tagName.getDisplayName(), tagName.getDescription(), tagName.getColor(), tagName.getKnownStatus());
TagName newTagName = portableSkCase.getTaggingManager().addOrUpdateTagName(tagName.getDisplayName(), tagName.getDescription(), tagName.getColor(), tagName.getKnownStatus());
oldTagNameToNewTagName.put(tagName, newTagName);
}
} catch (TskCoreException ex) {

2
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryService.java
View File

@ -149,7 +149,7 @@ public class ImageGalleryService implements AutopsyService {
private void addProjetVicTagSet(Case currentCase) throws TskCoreException {
List<TagName> tagNames = new ArrayList<>();
for (TagNameDefinition def : PROJECT_VIC_US_CATEGORIES) {
tagNames.add(currentCase.getSleuthkitCase().addOrUpdateTagName(def.getDisplayName(), def.getDescription(), def.getColor(), def.getKnownStatus()));
tagNames.add(currentCase.getSleuthkitCase().getTaggingManager().addOrUpdateTagName(def.getDisplayName(), def.getDescription(), def.getColor(), def.getKnownStatus()));
}
currentCase.getServices().getTagsManager().addTagSet(PROJECT_VIC_TAG_SET_NAME, tagNames);
}