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 branch 'develop' of https://www.github.com/sleuthkit/autopsy into develop

Browse Source
This commit is contained in:
alexjacks92 2014-01-21 14:33:54 -05:00
commit 88d36cba4f
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,6 +331,9 @@ public class Case implements SleuthkitCase.ErrorObserver {
String caseDir = xmlcm.getCaseDirectory();
String dbPath = caseDir + File.separator + "autopsy.db";
SleuthkitCase db = SleuthkitCase.openCase(dbPath);
if (null != db.getBackupDatabasePath()) {
JOptionPane.showMessageDialog(null, "Updated case database schema.\nA backup copy of the database with the following path has been made:\n " + db.getBackupDatabasePath(), "Case Database Schema Update", JOptionPane.INFORMATION_MESSAGE);
}
checkImagesExist(db);

11
Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
View File

@ -29,6 +29,7 @@ import org.openide.nodes.Children;
import org.openide.nodes.Sheet;
import org.openide.util.Lookup;
import org.openide.util.lookup.Lookups;
import org.sleuthkit.datamodel.AbstractFile;
import org.sleuthkit.datamodel.BlackboardArtifact;
import org.sleuthkit.datamodel.BlackboardAttribute;
import org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE;
@ -129,12 +130,12 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
// If mismatch, add props for extension and file type
if (artifactTypeId == BlackboardArtifact.ARTIFACT_TYPE.TSK_EXT_MISMATCH_DETECTED.getTypeID()) {
String actualExt = "";
int i = associated.getName().lastIndexOf(".");
if ((i > -1) && ((i + 1) < associated.getName().length())) {
actualExt = associated.getName().substring(i + 1).toLowerCase();
String ext = "";
if (associated instanceof AbstractFile) {
AbstractFile af = (AbstractFile) associated;
ext = af.getNameExtension();
}
ss.put(new NodeProperty("Extension", "Extension", NO_DESCR, actualExt));
ss.put(new NodeProperty("Extension", "Extension", NO_DESCR, ext));
try {
String actualMimeType = "";

6
FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java
View File

@ -132,11 +132,7 @@ public class FileExtMismatchIngestModule extends org.sleuthkit.autopsy.ingest.In
private boolean compareSigTypeToExt(AbstractFile abstractFile) {
try {
currActualExt = "";
int i = abstractFile.getName().lastIndexOf(".");
if ((i > -1) && ((i + 1) < abstractFile.getName().length())) {
currActualExt = abstractFile.getName().substring(i + 1).toLowerCase();
}
currActualExt = abstractFile.getNameExtension();
// If we are skipping names with no extension
if (skipNoExt && currActualExt.isEmpty()) {

2
FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml
View File

@ -36,6 +36,7 @@
<ext>php</ext>
<ext>php3</ext>
<ext>phtml</ext>
<ext>adp</ext>
<ext>h</ext>
<ext>hpp</ext>
<ext>hxx</ext>
@ -222,6 +223,7 @@
<ext>hta</ext>
<ext>wpl</ext>
<ext>htt</ext>
<ext>adp</ext>
</signature>
<signature mimetype="image/jpeg">
<ext>jpg</ext>