From 3311c1f2f656845c63208d43bb253b329ae7822d Mon Sep 17 00:00:00 2001 From: Alex Ebadirad Date: Fri, 29 Jun 2012 11:37:14 -0700 Subject: [PATCH 1/3] Minor GUI tweak to file separator paths for reports, also possible hotfix to displaying of html in HTML report to not break formatting. --- Report/src/org/sleuthkit/autopsy/report/Report.java | 3 ++- Report/src/org/sleuthkit/autopsy/report/ReportHTML.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Report/src/org/sleuthkit/autopsy/report/Report.java b/Report/src/org/sleuthkit/autopsy/report/Report.java index 7460ab08eb..6b795f70fb 100644 --- a/Report/src/org/sleuthkit/autopsy/report/Report.java +++ b/Report/src/org/sleuthkit/autopsy/report/Report.java @@ -34,6 +34,7 @@ import org.sleuthkit.datamodel.BlackboardAttribute; import org.sleuthkit.datamodel.SleuthkitCase; import java.sql.*; import java.text.SimpleDateFormat; +import org.apache.commons.lang.StringEscapeUtils; import org.sleuthkit.autopsy.recentactivity.dbconnect; public class Report { @@ -85,7 +86,7 @@ public class Report { table.append(""); } table.append(""); - table.append("").append("").append(""); + table.append("").append("").append(""); } tempdbconnect.executeStmt("DROP TABLE IF EXISTS report_keyword;"); diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Report/src/org/sleuthkit/autopsy/report/ReportHTML.java index 234bb4af3f..9aaf3f8e8c 100644 --- a/Report/src/org/sleuthkit/autopsy/report/ReportHTML.java +++ b/Report/src/org/sleuthkit/autopsy/report/ReportHTML.java @@ -38,6 +38,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.ingest.IngestManager; import org.sleuthkit.datamodel.*; +import java.io.File; /** * @@ -446,7 +447,7 @@ public class ReportHTML implements ReportModule { formatted_header.append(formatted_Report); // unformatted_header.append(formatted_Report); try { - htmlPath = currentCase.getCaseDirectory() + "/Reports/" + caseName + "-" + datenotime + ".html"; + htmlPath = currentCase.getCaseDirectory() + File.separator + "Reports" + File.separator + caseName + "-" + datenotime + ".html"; this.save(htmlPath); } catch (Exception e) { From 34d644097ca5f8cb457648ea3784eed43ad9fe3d Mon Sep 17 00:00:00 2001 From: Alex Ebadirad Date: Fri, 29 Jun 2012 11:59:20 -0700 Subject: [PATCH 2/3] Consistency for report names added --- Report/src/org/sleuthkit/autopsy/report/Report.java | 3 ++- Report/src/org/sleuthkit/autopsy/report/ReportHTML.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Report/src/org/sleuthkit/autopsy/report/Report.java b/Report/src/org/sleuthkit/autopsy/report/Report.java index 6b795f70fb..126c3e62c8 100644 --- a/Report/src/org/sleuthkit/autopsy/report/Report.java +++ b/Report/src/org/sleuthkit/autopsy/report/Report.java @@ -86,7 +86,8 @@ public class Report { table.append("
").append("File Name").append("PreviewKeyword List
").append(uniqueresults.getString("name")).append("").append(uniqueresults.getString("preview")).append("").append(uniqueresults.getString("list")).append("
(").append(uniqueresults.getString("exp")).append(")").append("
").append(StringEscapeUtils.escapeHtml(uniqueresults.getString("preview"))).append("").append(uniqueresults.getString("list")).append("
(").append(uniqueresults.getString("exp")).append(")").append("
"); } table.append(""); - table.append("").append("").append(""); + String previewreplace = StringEscapeUtils.escapeHtml(uniqueresults.getString("preview")); + table.append("").append(""); } tempdbconnect.executeStmt("DROP TABLE IF EXISTS report_keyword;"); diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Report/src/org/sleuthkit/autopsy/report/ReportHTML.java index 9aaf3f8e8c..7cd4da6b49 100644 --- a/Report/src/org/sleuthkit/autopsy/report/ReportHTML.java +++ b/Report/src/org/sleuthkit/autopsy/report/ReportHTML.java @@ -151,7 +151,7 @@ public class ReportHTML implements ReportModule { int reportsize = report.size(); Integer filesystemcount = currentCase.getRootObjectsCount(); DateFormat datetimeFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); - DateFormat dateFormat = new SimpleDateFormat("MM-dd-yyyy"); + DateFormat dateFormat = new SimpleDateFormat("MM-dd-yyyy-HH-mm-ss"); Date date = new Date(); String datetime = datetimeFormat.format(date); String datenotime = dateFormat.format(date); From f1fcf156b55c5bf44298173d8935381e609492d7 Mon Sep 17 00:00:00 2001 From: Alex Ebadirad Date: Fri, 29 Jun 2012 12:14:35 -0700 Subject: [PATCH 3/3] Hotfix to hashset/keyword html report display --- Report/src/org/sleuthkit/autopsy/report/Report.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Report/src/org/sleuthkit/autopsy/report/Report.java b/Report/src/org/sleuthkit/autopsy/report/Report.java index 126c3e62c8..84876f9849 100644 --- a/Report/src/org/sleuthkit/autopsy/report/Report.java +++ b/Report/src/org/sleuthkit/autopsy/report/Report.java @@ -100,7 +100,7 @@ public class Report { File f1 = new File(currentCase.getTempDirectory() + File.separator + "autopsy-copy.db"); boolean success = f1.delete(); - + table.append("
").append("File Name").append("PreviewKeyword List
").append(uniqueresults.getString("name")).append("").append(StringEscapeUtils.escapeHtml(uniqueresults.getString("preview"))).append("").append(uniqueresults.getString("list")).append("
(").append(uniqueresults.getString("exp")).append(")").append("
").append(previewreplace.replaceAll("").append("").append(uniqueresults.getString("list")).append("
(").append(uniqueresults.getString("exp")).append(")").append("


"); } catch (Exception e) { Logger.getLogger(Report.class.getName()).log(Level.WARNING, "Exception occurred", e); } @@ -150,10 +150,10 @@ public class Report { tempdbconnect.executeStmt("DROP TABLE IF EXISTS report_hashname;"); tempdbconnect.executeStmt("DROP TABLE IF EXISTS report_hash;"); tempdbconnect.closeConnection(); - + File f1 = new File(currentCase.getTempDirectory() + File.separator + "autopsy-copy.db"); boolean success = f1.delete(); - + table.append("

"); } catch (Exception e) { Logger.getLogger(Report.class.getName()).log(Level.WARNING, "Exception occurred", e); } @@ -231,6 +231,7 @@ public class Report { File f1 = new File(currentCase.getTempDirectory() + File.separator + "autopsy-copy.db"); boolean success = f1.delete(); + table.append("

"); } catch (Exception e) { Logger.getLogger(Report.class.getName()).log(Level.WARNING, "Exception occurred", e);