From 1e7d9b60a8c251721fae64056112136cf95e1e4b Mon Sep 17 00:00:00 2001 From: Karl Mortensen Date: Thu, 18 Sep 2014 13:31:15 -0400 Subject: [PATCH 1/4] Update platform.properties --- nbproject/platform.properties | 108 +++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 1 deletion(-) diff --git a/nbproject/platform.properties b/nbproject/platform.properties index d2a23fac30..1554e42acf 100644 --- a/nbproject/platform.properties +++ b/nbproject/platform.properties @@ -13,5 +13,111 @@ cluster.path=\ ${nbplatform.active.dir}/java:\ ${nbplatform.active.dir}/platform disabled.modules=\ - org.netbeans.modules.junit + org.apache.tools.ant.module,\ + org.netbeans.api.debugger.jpda,\ + org.netbeans.api.java,\ + org.netbeans.lib.nbjavac,\ + org.netbeans.libs.cglib,\ + org.netbeans.libs.javacapi,\ + org.netbeans.libs.javacimpl,\ + org.netbeans.libs.springframework,\ + org.netbeans.modules.ant.browsetask,\ + org.netbeans.modules.ant.debugger,\ + org.netbeans.modules.ant.freeform,\ + org.netbeans.modules.ant.grammar,\ + org.netbeans.modules.ant.kit,\ + org.netbeans.modules.beans,\ + org.netbeans.modules.classfile,\ + org.netbeans.modules.dbschema,\ + org.netbeans.modules.debugger.jpda,\ + org.netbeans.modules.debugger.jpda.ant,\ + org.netbeans.modules.debugger.jpda.kit,\ + org.netbeans.modules.debugger.jpda.projects,\ + org.netbeans.modules.debugger.jpda.ui,\ + org.netbeans.modules.debugger.jpda.visual,\ + org.netbeans.modules.findbugs.installer,\ + org.netbeans.modules.form,\ + org.netbeans.modules.form.binding,\ + org.netbeans.modules.form.j2ee,\ + org.netbeans.modules.form.kit,\ + org.netbeans.modules.form.nb,\ + org.netbeans.modules.form.refactoring,\ + org.netbeans.modules.hibernate,\ + org.netbeans.modules.hibernatelib,\ + org.netbeans.modules.hudson.ant,\ + org.netbeans.modules.hudson.maven,\ + org.netbeans.modules.i18n,\ + org.netbeans.modules.i18n.form,\ + org.netbeans.modules.j2ee.core.utilities,\ + org.netbeans.modules.j2ee.eclipselink,\ + org.netbeans.modules.j2ee.eclipselinkmodelgen,\ + org.netbeans.modules.j2ee.jpa.refactoring,\ + org.netbeans.modules.j2ee.jpa.verification,\ + org.netbeans.modules.j2ee.metadata,\ + org.netbeans.modules.j2ee.metadata.model.support,\ + org.netbeans.modules.j2ee.persistence,\ + org.netbeans.modules.j2ee.persistence.kit,\ + org.netbeans.modules.j2ee.persistenceapi,\ + org.netbeans.modules.java.api.common,\ + org.netbeans.modules.java.debug,\ + org.netbeans.modules.java.editor,\ + org.netbeans.modules.java.editor.lib,\ + org.netbeans.modules.java.examples,\ + org.netbeans.modules.java.freeform,\ + org.netbeans.modules.java.guards,\ + org.netbeans.modules.java.helpset,\ + org.netbeans.modules.java.hints,\ + org.netbeans.modules.java.hints.declarative,\ + org.netbeans.modules.java.hints.declarative.test,\ + org.netbeans.modules.java.hints.legacy.spi,\ + org.netbeans.modules.java.hints.test,\ + org.netbeans.modules.java.hints.ui,\ + org.netbeans.modules.java.j2seplatform,\ + org.netbeans.modules.java.j2seproject,\ + org.netbeans.modules.java.kit,\ + org.netbeans.modules.java.lexer,\ + org.netbeans.modules.java.navigation,\ + org.netbeans.modules.java.platform,\ + org.netbeans.modules.java.preprocessorbridge,\ + org.netbeans.modules.java.project,\ + org.netbeans.modules.java.source,\ + org.netbeans.modules.java.source.ant,\ + org.netbeans.modules.java.source.queries,\ + org.netbeans.modules.java.source.queriesimpl,\ + org.netbeans.modules.java.sourceui,\ + org.netbeans.modules.java.testrunner,\ + org.netbeans.modules.javadoc,\ + org.netbeans.modules.javawebstart,\ + org.netbeans.modules.junit,\ + org.netbeans.modules.maven,\ + org.netbeans.modules.maven.checkstyle,\ + org.netbeans.modules.maven.coverage,\ + org.netbeans.modules.maven.embedder,\ + org.netbeans.modules.maven.grammar,\ + org.netbeans.modules.maven.graph,\ + org.netbeans.modules.maven.hints,\ + org.netbeans.modules.maven.indexer,\ + org.netbeans.modules.maven.junit,\ + org.netbeans.modules.maven.kit,\ + org.netbeans.modules.maven.model,\ + org.netbeans.modules.maven.osgi,\ + org.netbeans.modules.maven.persistence,\ + org.netbeans.modules.maven.refactoring,\ + org.netbeans.modules.maven.repository,\ + org.netbeans.modules.maven.search,\ + org.netbeans.modules.maven.spring,\ + org.netbeans.modules.projectimport.eclipse.core,\ + org.netbeans.modules.projectimport.eclipse.j2se,\ + org.netbeans.modules.refactoring.java,\ + org.netbeans.modules.spellchecker.bindings.java,\ + org.netbeans.modules.spring.beans,\ + org.netbeans.modules.testng,\ + org.netbeans.modules.testng.ant,\ + org.netbeans.modules.testng.maven,\ + org.netbeans.modules.websvc.jaxws21,\ + org.netbeans.modules.websvc.jaxws21api,\ + org.netbeans.modules.websvc.saas.codegen.java,\ + org.netbeans.modules.xml.jaxb,\ + org.netbeans.modules.xml.tools.java,\ + org.netbeans.spi.java.hints From e4cc771cdf64aec3cd24505b177c628c15a8769c Mon Sep 17 00:00:00 2001 From: Karl Mortensen Date: Fri, 19 Sep 2014 16:24:35 -0400 Subject: [PATCH 2/4] Add metadata to HTML report --- .../org/sleuthkit/autopsy/report/Bundle.properties | 8 ++++++++ .../org/sleuthkit/autopsy/report/ReportGenerator.java | 11 ++++++++++- Core/src/org/sleuthkit/autopsy/report/ReportHTML.java | 9 ++++++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties index c891f3e19d..5380e0ff5a 100644 --- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties @@ -82,6 +82,14 @@ ReportGenerator.tagTable.header.tag=Tag ReportGenerator.tagTable.header.comment=Comment ReportGenerator.tagTable.header.srcFile=Source File ReportGenerator.progress.createdThumb.text=Creating thumbnails... +ReportGenerator.htmlOutput.header.file=File +ReportGenerator.htmlOutput.header.tag=Tag +ReportGenerator.htmlOutput.header.comment=Comment +ReportGenerator.htmlOutput.header.size=Size (Bytes) +ReportGenerator.htmlOutput.header.timeCreated=Time Created +ReportGenerator.htmlOutput.header.timeAccessed=Last Accessed +ReportGenerator.htmlOutput.header.timeModified=Last Modified +ReportGenerator.htmlOutput.header.hash=Hash ReportGenerator.thumbnailTable.name=Thumbnails ReportGenerator.thumbnailTable.desc=Contains thumbnails of images that are associated with tagged files and results. ReportGenerator.writeKwHits.userSrchs=User Searches diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java index 8f3e3770f1..7dc6298591 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java @@ -564,7 +564,16 @@ import org.sleuthkit.datamodel.TskData; tableProgress.get(module).updateStatusLabel( NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.processing", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName())); - ArrayList columnHeaders = new ArrayList<>(Arrays.asList("File", "Tag", "Comment")); //NON-NLS + ArrayList columnHeaders = new ArrayList<>(Arrays.asList( + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.file", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.tag", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.comment", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.size", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeCreated", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeAccessed", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeModified", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.hash", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()))); + StringBuilder comment = new StringBuilder(); if (!tagNamesFilter.isEmpty()) { comment.append( diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java index 9e1160c428..a1dafdeb09 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java @@ -535,7 +535,14 @@ import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM; row.add(""); return; } - + + // Add metadata about the file to HTML output + row.add(Long.toString(file.getSize())); + row.add(file.getCtimeAsDate()); + row.add(file.getAtimeAsDate()); + row.add(file.getMtimeAsDate()); + row.add(file.getMd5Hash()); + // save it in a folder based on the tag name String localFilePath = saveContent(file, contentTag.getName().getDisplayName()); From e62b03c36f25d1cac7482bcadbce2c4b07171463 Mon Sep 17 00:00:00 2001 From: Karl Mortensen Date: Mon, 22 Sep 2014 09:27:47 -0400 Subject: [PATCH 3/4] removed variable argument parameters --- .../autopsy/report/ReportGenerator.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java index 7dc6298591..e47e88b0e6 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java @@ -565,14 +565,14 @@ import org.sleuthkit.datamodel.TskData; NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.processing", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName())); ArrayList columnHeaders = new ArrayList<>(Arrays.asList( - NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.file", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), - NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.tag", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), - NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.comment", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), - NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.size", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), - NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeCreated", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), - NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeAccessed", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), - NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeModified", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), - NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.hash", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()))); + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.file"), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.tag"), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.comment"), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.size"), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeCreated"), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeAccessed"), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeModified"), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.hash"))); StringBuilder comment = new StringBuilder(); if (!tagNamesFilter.isEmpty()) { From fcc9a84635a619806e54243bc250ddf8965c773b Mon Sep 17 00:00:00 2001 From: Eugene Livis Date: Tue, 23 Sep 2014 11:01:24 -0400 Subject: [PATCH 4/4] my platform/properties --- nbproject/platform.properties | 108 +++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 1 deletion(-) diff --git a/nbproject/platform.properties b/nbproject/platform.properties index d2a23fac30..1554e42acf 100644 --- a/nbproject/platform.properties +++ b/nbproject/platform.properties @@ -13,5 +13,111 @@ cluster.path=\ ${nbplatform.active.dir}/java:\ ${nbplatform.active.dir}/platform disabled.modules=\ - org.netbeans.modules.junit + org.apache.tools.ant.module,\ + org.netbeans.api.debugger.jpda,\ + org.netbeans.api.java,\ + org.netbeans.lib.nbjavac,\ + org.netbeans.libs.cglib,\ + org.netbeans.libs.javacapi,\ + org.netbeans.libs.javacimpl,\ + org.netbeans.libs.springframework,\ + org.netbeans.modules.ant.browsetask,\ + org.netbeans.modules.ant.debugger,\ + org.netbeans.modules.ant.freeform,\ + org.netbeans.modules.ant.grammar,\ + org.netbeans.modules.ant.kit,\ + org.netbeans.modules.beans,\ + org.netbeans.modules.classfile,\ + org.netbeans.modules.dbschema,\ + org.netbeans.modules.debugger.jpda,\ + org.netbeans.modules.debugger.jpda.ant,\ + org.netbeans.modules.debugger.jpda.kit,\ + org.netbeans.modules.debugger.jpda.projects,\ + org.netbeans.modules.debugger.jpda.ui,\ + org.netbeans.modules.debugger.jpda.visual,\ + org.netbeans.modules.findbugs.installer,\ + org.netbeans.modules.form,\ + org.netbeans.modules.form.binding,\ + org.netbeans.modules.form.j2ee,\ + org.netbeans.modules.form.kit,\ + org.netbeans.modules.form.nb,\ + org.netbeans.modules.form.refactoring,\ + org.netbeans.modules.hibernate,\ + org.netbeans.modules.hibernatelib,\ + org.netbeans.modules.hudson.ant,\ + org.netbeans.modules.hudson.maven,\ + org.netbeans.modules.i18n,\ + org.netbeans.modules.i18n.form,\ + org.netbeans.modules.j2ee.core.utilities,\ + org.netbeans.modules.j2ee.eclipselink,\ + org.netbeans.modules.j2ee.eclipselinkmodelgen,\ + org.netbeans.modules.j2ee.jpa.refactoring,\ + org.netbeans.modules.j2ee.jpa.verification,\ + org.netbeans.modules.j2ee.metadata,\ + org.netbeans.modules.j2ee.metadata.model.support,\ + org.netbeans.modules.j2ee.persistence,\ + org.netbeans.modules.j2ee.persistence.kit,\ + org.netbeans.modules.j2ee.persistenceapi,\ + org.netbeans.modules.java.api.common,\ + org.netbeans.modules.java.debug,\ + org.netbeans.modules.java.editor,\ + org.netbeans.modules.java.editor.lib,\ + org.netbeans.modules.java.examples,\ + org.netbeans.modules.java.freeform,\ + org.netbeans.modules.java.guards,\ + org.netbeans.modules.java.helpset,\ + org.netbeans.modules.java.hints,\ + org.netbeans.modules.java.hints.declarative,\ + org.netbeans.modules.java.hints.declarative.test,\ + org.netbeans.modules.java.hints.legacy.spi,\ + org.netbeans.modules.java.hints.test,\ + org.netbeans.modules.java.hints.ui,\ + org.netbeans.modules.java.j2seplatform,\ + org.netbeans.modules.java.j2seproject,\ + org.netbeans.modules.java.kit,\ + org.netbeans.modules.java.lexer,\ + org.netbeans.modules.java.navigation,\ + org.netbeans.modules.java.platform,\ + org.netbeans.modules.java.preprocessorbridge,\ + org.netbeans.modules.java.project,\ + org.netbeans.modules.java.source,\ + org.netbeans.modules.java.source.ant,\ + org.netbeans.modules.java.source.queries,\ + org.netbeans.modules.java.source.queriesimpl,\ + org.netbeans.modules.java.sourceui,\ + org.netbeans.modules.java.testrunner,\ + org.netbeans.modules.javadoc,\ + org.netbeans.modules.javawebstart,\ + org.netbeans.modules.junit,\ + org.netbeans.modules.maven,\ + org.netbeans.modules.maven.checkstyle,\ + org.netbeans.modules.maven.coverage,\ + org.netbeans.modules.maven.embedder,\ + org.netbeans.modules.maven.grammar,\ + org.netbeans.modules.maven.graph,\ + org.netbeans.modules.maven.hints,\ + org.netbeans.modules.maven.indexer,\ + org.netbeans.modules.maven.junit,\ + org.netbeans.modules.maven.kit,\ + org.netbeans.modules.maven.model,\ + org.netbeans.modules.maven.osgi,\ + org.netbeans.modules.maven.persistence,\ + org.netbeans.modules.maven.refactoring,\ + org.netbeans.modules.maven.repository,\ + org.netbeans.modules.maven.search,\ + org.netbeans.modules.maven.spring,\ + org.netbeans.modules.projectimport.eclipse.core,\ + org.netbeans.modules.projectimport.eclipse.j2se,\ + org.netbeans.modules.refactoring.java,\ + org.netbeans.modules.spellchecker.bindings.java,\ + org.netbeans.modules.spring.beans,\ + org.netbeans.modules.testng,\ + org.netbeans.modules.testng.ant,\ + org.netbeans.modules.testng.maven,\ + org.netbeans.modules.websvc.jaxws21,\ + org.netbeans.modules.websvc.jaxws21api,\ + org.netbeans.modules.websvc.saas.codegen.java,\ + org.netbeans.modules.xml.jaxb,\ + org.netbeans.modules.xml.tools.java,\ + org.netbeans.spi.java.hints