mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-17 02:07:42 +00:00
Merged in develop and fixed conflict
This commit is contained in:
Kelly Kelly
commit
334a9d8a2c
@ -135,7 +135,7 @@ public class AnnotationUtils {
|
||||
* @return The pair of artifact (or null if not present) and content (either
|
||||
* artifact parent content, the node content, or null).
|
||||
*/
|
||||
private static Pair<BlackboardArtifact, Content> getDisplayContent(Node node) {
|
||||
static DisplayTskItems getDisplayContent(Node node) {
|
||||
BlackboardArtifactItem<?> artItem = node.getLookup().lookup(BlackboardArtifactItem.class);
|
||||
BlackboardArtifact artifact = artItem == null ? null : artItem.getTskContent();
|
||||
|
||||
@ -143,16 +143,18 @@ public class AnnotationUtils {
|
||||
? artItem.getSourceContent()
|
||||
: node.getLookup().lookup(AbstractFile.class);
|
||||
|
||||
return Pair.of(artifact, content);
|
||||
return new DisplayTskItems(artifact, content);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whether or not the node is supported by the annotation viewer.
|
||||
*
|
||||
* @param node The node to display.
|
||||
*
|
||||
* @return True if the node is supported.
|
||||
*/
|
||||
public static boolean isSupported(Node node) {
|
||||
return getDisplayContent(node).getRight() != null;
|
||||
return getDisplayContent(node).getContent() != null;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -168,9 +170,9 @@ public class AnnotationUtils {
|
||||
Document html = Jsoup.parse(EMPTY_HTML);
|
||||
Element body = html.getElementsByTag("body").first();
|
||||
|
||||
Pair<BlackboardArtifact, Content> displayPair = getDisplayContent(node);
|
||||
BlackboardArtifact artifact = displayPair.getLeft();
|
||||
Content srcContent = displayPair.getRight();
|
||||
DisplayTskItems displayItems = getDisplayContent(node);
|
||||
BlackboardArtifact artifact = displayItems.getArtifact();
|
||||
Content srcContent = displayItems.getContent();
|
||||
|
||||
boolean somethingWasRendered = false;
|
||||
if (artifact != null) {
|
||||
@ -677,4 +679,39 @@ public class AnnotationUtils {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The TSK items that are being displayed as deciphered from the netbeans
|
||||
* node.
|
||||
*/
|
||||
static class DisplayTskItems {
|
||||
|
||||
private final BlackboardArtifact artifact;
|
||||
private final Content content;
|
||||
|
||||
/**
|
||||
* Main constructor.
|
||||
*
|
||||
* @param artifact The artifact being displayed or null.
|
||||
* @param content The parent content or source file being displayed or
|
||||
* null.
|
||||
*/
|
||||
DisplayTskItems(BlackboardArtifact artifact, Content content) {
|
||||
this.artifact = artifact;
|
||||
this.content = content;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The selected artifact or null if no selected artifact.
|
||||
*/
|
||||
BlackboardArtifact getArtifact() {
|
||||
return artifact;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The parent content or source file being displayed or null.
|
||||
*/
|
||||
Content getContent() {
|
||||
return content;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -18,10 +18,16 @@
|
||||
*/
|
||||
package org.sleuthkit.autopsy.contentviewers.annotations;
|
||||
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import java.awt.Component;
|
||||
import java.beans.PropertyChangeEvent;
|
||||
import java.beans.PropertyChangeListener;
|
||||
import java.util.EnumSet;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.logging.Level;
|
||||
import javax.swing.SwingWorker;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import static org.openide.util.NbBundle.Messages;
|
||||
import org.openide.nodes.Node;
|
||||
@ -29,8 +35,19 @@ import org.openide.util.lookup.ServiceProvider;
|
||||
import org.sleuthkit.autopsy.corecomponentinterfaces.DataContentViewer;
|
||||
import org.sleuthkit.autopsy.coreutils.Logger;
|
||||
import org.jsoup.nodes.Document;
|
||||
import org.openide.util.WeakListeners;
|
||||
import org.sleuthkit.autopsy.casemodule.Case;
|
||||
import org.sleuthkit.autopsy.casemodule.events.BlackBoardArtifactTagAddedEvent;
|
||||
import org.sleuthkit.autopsy.casemodule.events.BlackBoardArtifactTagDeletedEvent;
|
||||
import org.sleuthkit.autopsy.casemodule.events.CommentChangedEvent;
|
||||
import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent;
|
||||
import org.sleuthkit.autopsy.casemodule.events.ContentTagDeletedEvent;
|
||||
import org.sleuthkit.autopsy.contentviewers.annotations.AnnotationUtils.DisplayTskItems;
|
||||
import org.sleuthkit.autopsy.contentviewers.layout.ContentViewerHtmlStyles;
|
||||
import org.sleuthkit.autopsy.contentviewers.utils.ViewerPriority;
|
||||
import org.sleuthkit.autopsy.ingest.IngestManager;
|
||||
import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
|
||||
import org.sleuthkit.datamodel.BlackboardArtifact;
|
||||
|
||||
/**
|
||||
* Annotations view of file contents.
|
||||
@ -47,7 +64,75 @@ public class AnnotationsContentViewer extends javax.swing.JPanel implements Data
|
||||
private static final long serialVersionUID = 1L;
|
||||
private static final Logger logger = Logger.getLogger(AnnotationsContentViewer.class.getName());
|
||||
|
||||
private AnnotationWorker worker;
|
||||
private static final Set<Case.Events> CASE_EVENTS_OF_INTEREST = EnumSet.of(
|
||||
Case.Events.BLACKBOARD_ARTIFACT_TAG_ADDED,
|
||||
Case.Events.BLACKBOARD_ARTIFACT_TAG_DELETED,
|
||||
Case.Events.CONTENT_TAG_ADDED,
|
||||
Case.Events.CONTENT_TAG_DELETED,
|
||||
Case.Events.CR_COMMENT_CHANGED);
|
||||
|
||||
private static final Set<IngestManager.IngestModuleEvent> INGEST_MODULE_EVENTS_OF_INTEREST = EnumSet.of(IngestManager.IngestModuleEvent.DATA_ADDED);
|
||||
|
||||
private static final Set<BlackboardArtifact.Type> ARTIFACT_TYPES_OF_INTEREST = ImmutableSet.of(
|
||||
BlackboardArtifact.Type.TSK_HASHSET_HIT,
|
||||
BlackboardArtifact.Type.TSK_INTERESTING_FILE_HIT
|
||||
);
|
||||
|
||||
private final PropertyChangeListener ingestEventListener = (evt) -> {
|
||||
Long curArtifactId = AnnotationsContentViewer.this.curArtifactId;
|
||||
Long curContentId = AnnotationsContentViewer.this.curContentId;
|
||||
|
||||
if (curArtifactId == null && curContentId == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
// if it is a module data event
|
||||
if (IngestManager.IngestModuleEvent.DATA_ADDED.toString().equals(evt.getPropertyName())
|
||||
&& evt.getOldValue() instanceof ModuleDataEvent) {
|
||||
|
||||
ModuleDataEvent moduleDataEvent = (ModuleDataEvent) evt.getOldValue();
|
||||
|
||||
// if an artifact is relevant, refresh
|
||||
if (ARTIFACT_TYPES_OF_INTEREST.contains(moduleDataEvent.getBlackboardArtifactType())) {
|
||||
for (BlackboardArtifact artifact : moduleDataEvent.getArtifacts()) {
|
||||
if ((curArtifactId != null && artifact.getArtifactID() == curArtifactId)
|
||||
|| (curContentId != null && artifact.getObjectID() == curContentId)) {
|
||||
refresh();
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
private final PropertyChangeListener weakIngestEventListener = WeakListeners.propertyChange(ingestEventListener, null);
|
||||
|
||||
private final PropertyChangeListener caseEventListener = (evt) -> {
|
||||
Long curArtifactId = AnnotationsContentViewer.this.curArtifactId;
|
||||
Long curContentId = AnnotationsContentViewer.this.curContentId;
|
||||
|
||||
if (curArtifactId == null && curContentId == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
Pair<Long, Long> artifactContentId = getIdsFromEvent(evt);
|
||||
Long artifactId = artifactContentId.getLeft();
|
||||
Long contentId = artifactContentId.getRight();
|
||||
|
||||
// if there is a match of content id or artifact id and the event, refresh
|
||||
if ((curArtifactId != null && curArtifactId.equals(artifactId)) || (curContentId != null && curContentId.equals(contentId))) {
|
||||
refresh();
|
||||
}
|
||||
};
|
||||
|
||||
private final PropertyChangeListener weakCaseEventListener = WeakListeners.propertyChange(caseEventListener, null);
|
||||
|
||||
private final Object updateLock = new Object();
|
||||
|
||||
private AnnotationWorker worker = null;
|
||||
private Node node;
|
||||
private Long curArtifactId;
|
||||
private Long curContentId;
|
||||
|
||||
/**
|
||||
* Creates an instance of AnnotationsContentViewer.
|
||||
@ -55,23 +140,138 @@ public class AnnotationsContentViewer extends javax.swing.JPanel implements Data
|
||||
public AnnotationsContentViewer() {
|
||||
initComponents();
|
||||
ContentViewerHtmlStyles.setupHtmlJTextPane(textPanel);
|
||||
registerListeners();
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers case event and ingest event listeners.
|
||||
*/
|
||||
private void registerListeners() {
|
||||
Case.addEventTypeSubscriber(CASE_EVENTS_OF_INTEREST, weakCaseEventListener);
|
||||
IngestManager.getInstance().addIngestModuleEventListener(INGEST_MODULE_EVENTS_OF_INTEREST, weakIngestEventListener);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void finalize() throws Throwable {
|
||||
unregisterListeners();
|
||||
}
|
||||
|
||||
/**
|
||||
* Unregisters case event and ingest event listeners.
|
||||
*/
|
||||
private void unregisterListeners() {
|
||||
Case.removeEventTypeSubscriber(CASE_EVENTS_OF_INTEREST, weakCaseEventListener);
|
||||
IngestManager.getInstance().addIngestModuleEventListener(INGEST_MODULE_EVENTS_OF_INTEREST, weakIngestEventListener);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setNode(Node node) {
|
||||
resetComponent();
|
||||
this.node = node;
|
||||
DisplayTskItems displayItems = AnnotationUtils.getDisplayContent(node);
|
||||
this.curArtifactId = displayItems.getArtifact() == null ? null : displayItems.getArtifact().getArtifactID();
|
||||
this.curContentId = displayItems.getContent() == null ? null : displayItems.getContent().getId();
|
||||
updateData(this.node, true);
|
||||
}
|
||||
|
||||
if (worker != null) {
|
||||
worker.cancel(true);
|
||||
worker = null;
|
||||
/**
|
||||
* Returns a pair of the artifact id (or null) and the content id (or null)
|
||||
* for the case event.
|
||||
*
|
||||
* @param evt The case event.
|
||||
*
|
||||
* @return A pair of the artifact id (or null) and the content id (or null)
|
||||
* for the case event.
|
||||
*/
|
||||
private static Pair<Long, Long> getIdsFromEvent(PropertyChangeEvent evt) {
|
||||
Case.Events eventType = null;
|
||||
try {
|
||||
eventType = Case.Events.valueOf(evt.getPropertyName());
|
||||
} catch (IllegalArgumentException ex) {
|
||||
logger.log(Level.SEVERE, "Unknown event type: " + evt.getPropertyName(), ex);
|
||||
return Pair.of(null, null);
|
||||
}
|
||||
|
||||
Long artifactId = null;
|
||||
Long contentId = null;
|
||||
|
||||
switch (eventType) {
|
||||
case BLACKBOARD_ARTIFACT_TAG_ADDED:
|
||||
if (evt instanceof BlackBoardArtifactTagAddedEvent) {
|
||||
BlackboardArtifact art = ((BlackBoardArtifactTagAddedEvent) evt).getAddedTag().getArtifact();
|
||||
artifactId = art.getArtifactID();
|
||||
contentId = art.getObjectID();
|
||||
}
|
||||
break;
|
||||
case BLACKBOARD_ARTIFACT_TAG_DELETED:
|
||||
if (evt instanceof BlackBoardArtifactTagDeletedEvent) {
|
||||
artifactId = ((BlackBoardArtifactTagDeletedEvent) evt).getDeletedTagInfo().getArtifactID();
|
||||
contentId = ((BlackBoardArtifactTagDeletedEvent) evt).getDeletedTagInfo().getContentID();
|
||||
}
|
||||
break;
|
||||
case CONTENT_TAG_ADDED:
|
||||
if (evt instanceof ContentTagAddedEvent) {
|
||||
contentId = ((ContentTagAddedEvent) evt).getAddedTag().getContent().getId();
|
||||
}
|
||||
break;
|
||||
case CONTENT_TAG_DELETED:
|
||||
if (evt instanceof ContentTagDeletedEvent) {
|
||||
contentId = ((ContentTagDeletedEvent) evt).getDeletedTagInfo().getContentID();
|
||||
}
|
||||
break;
|
||||
case CR_COMMENT_CHANGED:
|
||||
if (evt instanceof CommentChangedEvent) {
|
||||
long commentObjId = ((CommentChangedEvent) evt).getContentID();
|
||||
artifactId = commentObjId;
|
||||
contentId = commentObjId;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
};
|
||||
|
||||
return Pair.of(artifactId, contentId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Refreshes the data displayed.
|
||||
*/
|
||||
private void refresh() {
|
||||
if (this.isVisible()) {
|
||||
updateData(this.node, false);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates data displayed in the viewer.
|
||||
*
|
||||
* @param node The node to use for data.
|
||||
* @param forceReset If true, forces a reset cancelling the previous worker
|
||||
* if one exists and clearing data in the component. If
|
||||
* false, only submits a worker if no previous worker is
|
||||
* running.
|
||||
*/
|
||||
private void updateData(Node node, boolean forceReset) {
|
||||
if (node == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
worker = new AnnotationWorker(node);
|
||||
worker.execute();
|
||||
if (forceReset) {
|
||||
resetComponent();
|
||||
}
|
||||
|
||||
synchronized (updateLock) {
|
||||
if (worker != null) {
|
||||
if (forceReset) {
|
||||
worker.cancel(true);
|
||||
worker = null;
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
worker = new AnnotationWorker(node, forceReset);
|
||||
worker.execute();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -142,6 +342,7 @@ public class AnnotationsContentViewer extends javax.swing.JPanel implements Data
|
||||
@Override
|
||||
public void resetComponent() {
|
||||
textPanel.setText("");
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@ -151,9 +352,18 @@ public class AnnotationsContentViewer extends javax.swing.JPanel implements Data
|
||||
private class AnnotationWorker extends SwingWorker<String, Void> {
|
||||
|
||||
private final Node node;
|
||||
private final boolean resetCaretPosition;
|
||||
|
||||
AnnotationWorker(Node node) {
|
||||
/**
|
||||
* Main constructor.
|
||||
*
|
||||
* @param node The node for which data will be fetched.
|
||||
* @param resetCaretPosition Whether or not to reset the caret position
|
||||
* when finished.
|
||||
*/
|
||||
AnnotationWorker(Node node, boolean resetCaretPosition) {
|
||||
this.node = node;
|
||||
this.resetCaretPosition = resetCaretPosition;
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -173,17 +383,25 @@ public class AnnotationsContentViewer extends javax.swing.JPanel implements Data
|
||||
|
||||
@Override
|
||||
public void done() {
|
||||
if (isCancelled()) {
|
||||
return;
|
||||
if (!isCancelled()) {
|
||||
try {
|
||||
String text = get();
|
||||
ContentViewerHtmlStyles.setStyles(textPanel);
|
||||
textPanel.setText(text);
|
||||
|
||||
if (resetCaretPosition) {
|
||||
textPanel.setCaretPosition(0);
|
||||
}
|
||||
|
||||
} catch (InterruptedException | ExecutionException ex) {
|
||||
logger.log(Level.SEVERE, "Failed to get annotation information for node", ex);
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
String text = get();
|
||||
ContentViewerHtmlStyles.setStyles(textPanel);
|
||||
textPanel.setText(text);
|
||||
textPanel.setCaretPosition(0);
|
||||
} catch (InterruptedException | ExecutionException ex) {
|
||||
logger.log(Level.SEVERE, "Failed to get annotation information for node", ex);
|
||||
synchronized (updateLock) {
|
||||
if (worker == this) {
|
||||
worker = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -23,13 +23,13 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
|
||||
import org.sleuthkit.datamodel.Content;
|
||||
|
||||
/**
|
||||
* An super class for an Autopsy Data Model item class with an underlying
|
||||
* BlackboardArtifact Sleuth Kit Data Model object, i.e., a DataArtifact or an
|
||||
* AnalysisResult.
|
||||
* An abstract super class for an Autopsy Data Model item class with an
|
||||
* underlying BlackboardArtifact Sleuth Kit Data Model object, i.e., a
|
||||
* DataArtifact or an AnalysisResult.
|
||||
*
|
||||
* @param <T> The concrete BlackboardArtifact class type.
|
||||
* @param <T> The concrete BlackboardArtifact sub class type.
|
||||
*/
|
||||
public class BlackboardArtifactItem<T extends BlackboardArtifact> extends TskContentItem<T> {
|
||||
public abstract class BlackboardArtifactItem<T extends BlackboardArtifact> extends TskContentItem<T> {
|
||||
|
||||
private final Content sourceContent;
|
||||
|
||||
|
||||
@ -37,7 +37,6 @@ import java.util.Map;
|
||||
import java.util.MissingResourceException;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.concurrent.Future;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.logging.Level;
|
||||
import java.util.stream.Collectors;
|
||||
@ -159,7 +158,6 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
|
||||
private Content srcContent;
|
||||
private volatile String translatedSourceName;
|
||||
private final String sourceObjTypeName;
|
||||
private final String srcContentShortDescription;
|
||||
|
||||
/*
|
||||
* A method has been provided to allow the injection of properties into this
|
||||
@ -269,11 +267,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
|
||||
logger.log(Level.WARNING, MessageFormat.format("Error getting the unique path of the source content (artifact objID={0})", artifact.getId()), ex);
|
||||
}
|
||||
sourceObjTypeName = getSourceObjType(srcContent);
|
||||
srcContentShortDescription = getContentShortDescription(srcContent);
|
||||
setDisplayNameBySourceContent();
|
||||
setName(Long.toString(artifact.getArtifactID()));
|
||||
String displayName = srcContent.getName();
|
||||
setDisplayName(displayName);
|
||||
setShortDescription(displayName);
|
||||
setIconBaseWithExtension(iconPath != null && iconPath.charAt(0) == '/' ? iconPath.substring(1) : iconPath);
|
||||
Case.addEventTypeSubscriber(CASE_EVENTS_OF_INTEREST, weakListener);
|
||||
}
|
||||
@ -317,11 +312,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
|
||||
throw new IllegalArgumentException(MessageFormat.format("Artifact missing source content (artifact objID={0})", artifact));
|
||||
}
|
||||
sourceObjTypeName = getSourceObjType(srcContent);
|
||||
srcContentShortDescription = getContentShortDescription(srcContent);
|
||||
setName(Long.toString(artifact.getArtifactID()));
|
||||
String displayName = srcContent.getName();
|
||||
setDisplayName(displayName);
|
||||
setShortDescription(displayName);
|
||||
setDisplayNameBySourceContent();
|
||||
String iconPath = IconsUtil.getIconFilePath(artifact.getArtifactTypeID());
|
||||
setIconBaseWithExtension(iconPath != null && iconPath.charAt(0) == '/' ? iconPath.substring(1) : iconPath);
|
||||
Case.addEventTypeSubscriber(CASE_EVENTS_OF_INTEREST, weakListener);
|
||||
@ -393,10 +385,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
|
||||
BlackboardArtifactItem<?> artifactItem;
|
||||
if (artifact instanceof AnalysisResult) {
|
||||
artifactItem = new AnalysisResultItem((AnalysisResult) artifact, content);
|
||||
} else if (artifact instanceof DataArtifact) {
|
||||
artifactItem = new DataArtifactItem((DataArtifact) artifact, content);
|
||||
} else {
|
||||
artifactItem = new BlackboardArtifactItem<>(artifact, content);
|
||||
artifactItem = new DataArtifactItem((DataArtifact) artifact, content);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -862,8 +852,8 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
|
||||
}
|
||||
|
||||
@NbBundle.Messages({
|
||||
"BlackboardArtifactNode.createSheet.srcFile.name=Source File",
|
||||
"BlackboardArtifactNode.createSheet.srcFile.displayName=Source File",
|
||||
"BlackboardArtifactNode.createSheet.srcFile.name=Source Name",
|
||||
"BlackboardArtifactNode.createSheet.srcFile.displayName=Source Name",
|
||||
"BlackboardArtifactNode.createSheet.srcFile.origName=Original Name",
|
||||
"BlackboardArtifactNode.createSheet.srcFile.origDisplayName=Original Name",
|
||||
"BlackboardArtifactNode.createSheet.artifactType.displayName=Result Type",
|
||||
@ -888,6 +878,18 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
|
||||
sheetSet = Sheet.createPropertiesSet();
|
||||
sheet.put(sheetSet);
|
||||
}
|
||||
|
||||
/*
|
||||
* Add the name of the source content of the artifact represented by
|
||||
* this node to the sheet. The value of this property is the same as
|
||||
* the display name of the node and this a "special" property that
|
||||
* displays the node's icon as well as the display name.
|
||||
*/
|
||||
sheetSet.put(new NodeProperty<>(
|
||||
Bundle.BlackboardArtifactNode_createSheet_srcFile_name(),
|
||||
Bundle.BlackboardArtifactNode_createSheet_srcFile_displayName(),
|
||||
NO_DESCR,
|
||||
getDisplayName()));
|
||||
|
||||
GetSCOTask scoTask = null;
|
||||
if (artifact instanceof AnalysisResult
|
||||
@ -1417,7 +1419,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
|
||||
Bundle.BlackboardArtifactNode_analysisSheet_soureName_name(),
|
||||
Bundle.BlackboardArtifactNode_analysisSheet_soureName_name(),
|
||||
NO_DESCR,
|
||||
srcContentShortDescription));
|
||||
getDisplayName()));
|
||||
|
||||
GetSCOTask task = addSCOColumns(sheetSet);
|
||||
|
||||
@ -1520,28 +1522,6 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a short description for the given content object.
|
||||
*
|
||||
* @param content The content object.
|
||||
*
|
||||
* @return A short description/label.
|
||||
*/
|
||||
private String getContentShortDescription(Content content) {
|
||||
if (content != null) {
|
||||
if (content instanceof BlackboardArtifact) {
|
||||
try {
|
||||
return ((BlackboardArtifact) content).getShortDescription();
|
||||
} catch (TskCoreException ex) {
|
||||
logger.log(Level.SEVERE, "Failed to get short description for artifact id=" + content.getId(), ex);
|
||||
}
|
||||
}
|
||||
|
||||
return content.getName();
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the SCO columns with the data retrieved in the background
|
||||
@ -1578,6 +1558,28 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the displayName of the node based on the source content.
|
||||
*/
|
||||
private void setDisplayNameBySourceContent() {
|
||||
if(srcContent instanceof BlackboardArtifact) {
|
||||
try {
|
||||
setDisplayName(((BlackboardArtifact)srcContent).getShortDescription());
|
||||
} catch (TskCoreException ex) {
|
||||
// Log the error, but set the display name to
|
||||
// Content.getName so there is something visible to the user.
|
||||
logger.log(Level.WARNING, "Failed to get short description for artifact id = " + srcContent.getId(), ex);
|
||||
setDisplayName(srcContent.getName());
|
||||
}
|
||||
} else if(srcContent instanceof OsAccount) {
|
||||
setDisplayName(((OsAccount)srcContent).getAddr().orElse(srcContent.getName()));
|
||||
} else {
|
||||
setDisplayName(srcContent.getName());
|
||||
}
|
||||
|
||||
setShortDescription(getDisplayName());
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds the score property for the artifact represented by this node to the
|
||||
* node property sheet.
|
||||
|
||||
@ -66,7 +66,7 @@ GeolocationPanel_onNoCrIngest_message=No results will be shown because the GPX P
|
||||
GeolocationPanel_unknownRow_title=Unknown
|
||||
PastCasesPanel_caseColumn_title=Case
|
||||
PastCasesPanel_countColumn_title=Count
|
||||
PastCasesPanel_notableFileTable_tabName=Cases with Common Notable
|
||||
PastCasesPanel_notableFileTable_tabName=Cases with Common Notable Items at Time Of Ingest
|
||||
PastCasesPanel_onNoCrIngest_message=No results will be shown because the Central Repository module was not run.
|
||||
PastCasesPanel_sameIdsTable_tabName=Past Cases with the Same Devices
|
||||
RecentFilesPanel_attachmentsTable_tabName=Recent Attachments
|
||||
|
||||
@ -41,7 +41,7 @@ import org.sleuthkit.datamodel.DataSource;
|
||||
"PastCasesPanel_caseColumn_title=Case",
|
||||
"PastCasesPanel_countColumn_title=Count",
|
||||
"PastCasesPanel_onNoCrIngest_message=No results will be shown because the Central Repository module was not run.",
|
||||
"PastCasesPanel_notableFileTable_tabName=Cases with Common Notable",
|
||||
"PastCasesPanel_notableFileTable_tabName=Cases with Common Notable Items at Time Of Ingest",
|
||||
"PastCasesPanel_sameIdsTable_tabName=Past Cases with the Same Devices",})
|
||||
public class PastCasesPanel extends BaseDataSourceSummaryPanel {
|
||||
|
||||
|
||||
@ -54,7 +54,7 @@ ExportIngestHistory_startTimeColumn=Start Time
|
||||
ExportIngestHistory_versionColumn=Module Version
|
||||
ExportPastCases_caseColumn_title=Case
|
||||
ExportPastCases_countColumn_title=Count
|
||||
ExportPastCases_notableFileTable_tabName=Cases with Common Notable
|
||||
ExportPastCases_notableFileTable_tabName=Cases with Common Notable Items at Time Of Ingest
|
||||
ExportPastCases_sameIdsTable_tabName=Past Cases with the Same Devices
|
||||
ExportRecentFiles_attachmentsTable_tabName=Recent Attachments
|
||||
ExportRecentFiles_col_head_date=Date
|
||||
|
||||
@ -37,7 +37,7 @@ import org.sleuthkit.datamodel.DataSource;
|
||||
@Messages({
|
||||
"ExportPastCases_caseColumn_title=Case",
|
||||
"ExportPastCases_countColumn_title=Count",
|
||||
"ExportPastCases_notableFileTable_tabName=Cases with Common Notable",
|
||||
"ExportPastCases_notableFileTable_tabName=Cases with Common Notable Items at Time Of Ingest",
|
||||
"ExportPastCases_sameIdsTable_tabName=Past Cases with the Same Devices",})
|
||||
class ExportPastCases {
|
||||
|
||||
|
||||
@ -5,6 +5,10 @@ ChromeCacheExtract_adding_artifacts_msg=Chrome Cache: Adding %d artifacts for an
|
||||
ChromeCacheExtract_adding_extracted_files_msg=Chrome Cache: Adding %d extracted files for analysis.
|
||||
ChromeCacheExtract_loading_files_msg=Chrome Cache: Loading files from %s.
|
||||
ChromeCacheExtractor.moduleName=ChromeCacheExtractor
|
||||
# {0} - module name
|
||||
# {1} - row number
|
||||
# {2} - table length
|
||||
# {3} - cache path
|
||||
ChromeCacheExtractor.progressMsg={0}: Extracting cache entry {1} of {2} entries from {3}
|
||||
DataSourceUsage_AndroidMedia=Android Media Card
|
||||
DataSourceUsage_DJU_Drone_DAT=DJI Internal SD Card
|
||||
@ -152,13 +156,19 @@ Firefox.getDlV24.errMsg.errAnalyzeFile={0}: Error while trying to analyze file:{
|
||||
Firefox.getDlV24.errMsg.errParsingArtifacts={0}: Error parsing {1} Firefox web download artifacts.
|
||||
Progress_Message_Analyze_Registry=Analyzing Registry Files
|
||||
Progress_Message_Analyze_Usage=Data Sources Usage Analysis
|
||||
# {0} - browserName
|
||||
Progress_Message_Chrome_AutoFill=Chrome Auto Fill Browser {0}
|
||||
# {0} - browserName
|
||||
Progress_Message_Chrome_Bookmarks=Chrome Bookmarks Browser {0}
|
||||
Progress_Message_Chrome_Cache=Chrome Cache
|
||||
# {0} - browserName
|
||||
Progress_Message_Chrome_Cookies=Chrome Cookies Browser {0}
|
||||
# {0} - browserName
|
||||
Progress_Message_Chrome_Downloads=Chrome Downloads Browser {0}
|
||||
Progress_Message_Chrome_FormHistory=Chrome Form History
|
||||
# {0} - browserName
|
||||
Progress_Message_Chrome_History=Chrome History Browser {0}
|
||||
# {0} - browserName
|
||||
Progress_Message_Chrome_Logins=Chrome Logins Browser {0}
|
||||
Progress_Message_Edge_Bookmarks=Microsoft Edge Bookmarks
|
||||
Progress_Message_Edge_Cookies=Microsoft Edge Cookies
|
||||
|
||||
@ -592,8 +592,13 @@ final class ChromeCacheExtractor {
|
||||
|
||||
// see if it is cached
|
||||
String fileTableKey = cacheFolderName + cacheFileName;
|
||||
if (cacheFileName.startsWith("f_") && externalFilesTable.containsKey(fileTableKey)) {
|
||||
return Optional.of(externalFilesTable.get(fileTableKey));
|
||||
|
||||
if (cacheFileName != null) {
|
||||
if (cacheFileName.startsWith("f_") && externalFilesTable.containsKey(fileTableKey)) {
|
||||
return Optional.of(externalFilesTable.get(fileTableKey));
|
||||
}
|
||||
} else {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
if (fileCopyCache.containsKey(fileTableKey)) {
|
||||
@ -1306,7 +1311,7 @@ final class ChromeCacheExtractor {
|
||||
|
||||
private String key; // Key may be found within the entry or may be external
|
||||
|
||||
CacheEntry(CacheAddress cacheAdress, FileWrapper cacheFileCopy ) throws TskCoreException {
|
||||
CacheEntry(CacheAddress cacheAdress, FileWrapper cacheFileCopy ) throws TskCoreException, IngestModuleException {
|
||||
this.selfAddress = cacheAdress;
|
||||
this.cacheFileCopy = cacheFileCopy;
|
||||
|
||||
@ -1315,7 +1320,11 @@ final class ChromeCacheExtractor {
|
||||
int entryOffset = DATAFILE_HDR_SIZE + cacheAdress.getStartBlock() * cacheAdress.getBlockSize();
|
||||
|
||||
// reposition the buffer to the the correct offset
|
||||
fileROBuf.position(entryOffset);
|
||||
if (entryOffset < fileROBuf.capacity()) {
|
||||
fileROBuf.position(entryOffset);
|
||||
} else {
|
||||
throw new IngestModuleException("Position seeked in Buffer to big"); // NON-NLS
|
||||
}
|
||||
|
||||
hash = fileROBuf.getInt() & UINT32_MASK;
|
||||
|
||||
@ -1364,11 +1373,13 @@ final class ChromeCacheExtractor {
|
||||
if (longKeyAddresses != null) {
|
||||
// Key is stored outside of the entry
|
||||
try {
|
||||
CacheDataSegment data = new CacheDataSegment(longKeyAddresses, this.keyLen, true);
|
||||
key = data.getDataString();
|
||||
if (longKeyAddresses.getFilename() != null) {
|
||||
CacheDataSegment data = new CacheDataSegment(longKeyAddresses, this.keyLen, true);
|
||||
key = data.getDataString();
|
||||
}
|
||||
} catch (TskCoreException | IngestModuleException ex) {
|
||||
throw new TskCoreException(String.format("Failed to get external key from address %s", longKeyAddresses)); //NON-NLS
|
||||
}
|
||||
}
|
||||
}
|
||||
else { // key stored within entry
|
||||
StringBuilder strBuilder = new StringBuilder(MAX_KEY_LEN);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user