From 0d3658c34d4da27f7e8b1a1df05943d9245f8d74 Mon Sep 17 00:00:00 2001 From: "Samuel H. Kenyon" Date: Fri, 17 Jan 2014 13:31:51 -0500 Subject: [PATCH 1/6] Add adp extension (as in AOLserver Dynamic Pages) to the text/html section. --- .../org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml index 7b5c0dbb1c..6cca4af3d4 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml @@ -222,6 +222,7 @@ hta wpl htt + adp jpg From 47ea29634acf50cd72ea9c4de59d18a4db9c13cd Mon Sep 17 00:00:00 2001 From: "Samuel H. Kenyon" Date: Fri, 17 Jan 2014 14:40:16 -0500 Subject: [PATCH 2/6] Use AbstractFile.getNameExtension() --- .../fileextmismatch/FileExtMismatchIngestModule.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java index 9037b9756c..459f61d694 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java @@ -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()) { From 5e457da4891dc634204d862ac0062c564a47b68a Mon Sep 17 00:00:00 2001 From: "Samuel H. Kenyon" Date: Fri, 17 Jan 2014 14:40:49 -0500 Subject: [PATCH 3/6] Also add "adp" extension to plaintext. --- .../org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml index 6cca4af3d4..bada97fa28 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml @@ -36,6 +36,7 @@ php php3 phtml + adp h hpp hxx From dfe149d54b3970f0bdf4e4b1f8b78d8e608c5ae4 Mon Sep 17 00:00:00 2001 From: "Samuel H. Kenyon" Date: Fri, 17 Jan 2014 16:18:03 -0500 Subject: [PATCH 4/6] Get the same extension that Mismatch module uses. --- .../autopsy/datamodel/BlackboardArtifactNode.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java index 02a3a351fa..5d1f3ffa89 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java @@ -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,13 +130,9 @@ 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(); - } - ss.put(new NodeProperty("Extension", "Extension", NO_DESCR, actualExt)); - + AbstractFile af = (AbstractFile)associated; + ss.put(new NodeProperty("Extension", "Extension", NO_DESCR, af.getNameExtension())); + try { String actualMimeType = ""; ArrayList artList = associated.getAllArtifacts(); From 84bdc0911576257d299f2e7c38e548e4a6a61a36 Mon Sep 17 00:00:00 2001 From: "Samuel H. Kenyon" Date: Fri, 17 Jan 2014 16:56:33 -0500 Subject: [PATCH 5/6] safety dance --- .../autopsy/datamodel/BlackboardArtifactNode.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java index 5d1f3ffa89..2178d3be0e 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java @@ -130,8 +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()) { - AbstractFile af = (AbstractFile)associated; - ss.put(new NodeProperty("Extension", "Extension", NO_DESCR, af.getNameExtension())); + String ext = ""; + if (associated instanceof AbstractFile) { + AbstractFile af = (AbstractFile) associated; + ext = af.getNameExtension(); + } + ss.put(new NodeProperty("Extension", "Extension", NO_DESCR, ext)); try { String actualMimeType = ""; From 5eab10bbe74ec6b561c9724da89e719c13c57cd6 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Tue, 21 Jan 2014 00:18:15 -0500 Subject: [PATCH 6/6] Added notification of case db schema upgrade backup --- Core/src/org/sleuthkit/autopsy/casemodule/Case.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java index 794d27a745..f59272635f 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java @@ -331,7 +331,10 @@ 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); Case openedCase = new Case(caseName, caseNumber, examiner, configFilePath, xmlcm, db);