From 185c73946b07ac1fb4f0cc669c98214356fc51a0 Mon Sep 17 00:00:00 2001
From: Alex Ebadirad <aebadirad@42six.com>
Date: Tue, 27 Mar 2012 02:04:49 -0700
Subject: [PATCH] Changes to progress bar and html encoding issues when viewed
 from browsers

Signed-off-by: Alex Ebadirad <aebadirad@42six.com>
---
 .../recentactivity/ExtractRegistry.java       | 28 +++++++++----------
 .../autopsy/report/reportFilter.java          |  1 +
 .../sleuthkit/autopsy/report/reportHTML.java  |  8 ++++--
 .../sleuthkit/autopsy/report/reportPanel.java |  9 ++++--
 .../autopsy/report/reportPanelAction.java     |  7 +++--
 5 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
index 737b2cff7c..8d8b5c2684 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
@@ -233,30 +233,28 @@ public void getregistryfiles(List<String> image, IngestImageWorkerController con
                  String value = artnode.getTextTrim();  
                  Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
                 
-                   if("recentdocs".equals(context)){
-                       
+               if("recentdocs".equals(context)){        
                BlackboardArtifact bbart = tempDb.getContentById(orgId).newArtifact(ARTIFACT_TYPE.TSK_RECENT_OBJECT);
                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_LAST_ACCESSED.getTypeID(), "RecentActivity", context, time));
-                  bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(), "RecentActivity", context, name));
-      
-                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_VALUE.getTypeID(), "RecentActivity", context, value));
-                bbart.addAttributes(bbattributes);
-                 }
+               bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(), "RecentActivity", context, name));
+               bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_VALUE.getTypeID(), "RecentActivity", context, value));
+               bbart.addAttributes(bbattributes);
+               }
                else if("runMRU".equals(context)){
                 BlackboardArtifact bbart = tempDb.getContentById(orgId).newArtifact(ARTIFACT_TYPE.TSK_RECENT_OBJECT);
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_LAST_ACCESSED.getTypeID(), "RecentActivity", context, time));
-                  bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(), "RecentActivity", context, name));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(), "RecentActivity", context, name));
       
-                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_VALUE.getTypeID(), "RecentActivity", context, value));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_VALUE.getTypeID(), "RecentActivity", context, value));
                 bbart.addAttributes(bbattributes);
                }
-                 else if("uninstall".equals(context)){
-                     bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_LAST_ACCESSED.getTypeID(), "RecentActivity", context, time));
-                  bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "RecentActivity", context, value));
+               else if("uninstall".equals(context)){
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_LAST_ACCESSED.getTypeID(), "RecentActivity", context, time));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "RecentActivity", context, value));
       
-                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(), "RecentActivity", context, name));
-                     BlackboardArtifact bbart = tempDb.getContentById(orgId).newArtifact(ARTIFACT_TYPE.TSK_INSTALLED_PROG);
-                 bbart.addAttributes(bbattributes);
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(), "RecentActivity", context, name));
+                BlackboardArtifact bbart = tempDb.getContentById(orgId).newArtifact(ARTIFACT_TYPE.TSK_INSTALLED_PROG);
+                bbart.addAttributes(bbattributes);
                 }
                  else if("WinVersion".equals(context)){
                      
diff --git a/Report/src/org/sleuthkit/autopsy/report/reportFilter.java b/Report/src/org/sleuthkit/autopsy/report/reportFilter.java
index c6103af111..1466f6a3f7 100644
--- a/Report/src/org/sleuthkit/autopsy/report/reportFilter.java
+++ b/Report/src/org/sleuthkit/autopsy/report/reportFilter.java
@@ -247,6 +247,7 @@ public void progBarDone(){
 
 public void progBarText(){
     progBar.setString("Populating Report - Please wait...");
+    progBar.setIndeterminate(true);
 }
 
 public void progBarCount(int count){
diff --git a/Report/src/org/sleuthkit/autopsy/report/reportHTML.java b/Report/src/org/sleuthkit/autopsy/report/reportHTML.java
index 539948563d..2a0b42ae81 100644
--- a/Report/src/org/sleuthkit/autopsy/report/reportHTML.java
+++ b/Report/src/org/sleuthkit/autopsy/report/reportHTML.java
@@ -5,7 +5,9 @@
 package org.sleuthkit.autopsy.report;
 
 import java.io.BufferedWriter;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -103,7 +105,7 @@ public reportHTML (HashMap<BlackboardArtifact,ArrayList<BlackboardAttribute>> re
              Date date = new Date();
              String datetime = datetimeFormat.format(date);
              String datenotime = dateFormat.format(date);
-             String CSS = "<style>"
+             String CSS = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><style>"
                      + "body {padding: 30px; margin: 0; background: #FFFFFF; font: 13px/20px Arial, Helvetica, sans-serif; color: #535353;} "
                    + "h1 {font-size: 26px; color: #005577; margin: 0 0 20px 0;} "
                     + "h2 {font-size: 20px; font-weight: normal; color: #0077aa; margin: 40px 0 10px 0; padding: 0 0 10px 0; border-bottom: 1px solid #dddddd;} "
@@ -337,7 +339,7 @@ public reportHTML (HashMap<BlackboardArtifact,ArrayList<BlackboardAttribute>> re
                 formatted_header.append(formatted_Report);
                 unformatted_header.append(formatted_Report);
                   htmlPath = currentCase.getCaseDirectory()+"/Reports/" + caseName + "-" + datenotime + ".html";
-                   BufferedWriter out = new BufferedWriter(new FileWriter(htmlPath));
+                  Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(htmlPath), "UTF-8"));
                    out.write(formatted_header.toString());
                    
                   out.flush();
diff --git a/Report/src/org/sleuthkit/autopsy/report/reportPanel.java b/Report/src/org/sleuthkit/autopsy/report/reportPanel.java
index 5e3dc31c71..24809ed3a9 100644
--- a/Report/src/org/sleuthkit/autopsy/report/reportPanel.java
+++ b/Report/src/org/sleuthkit/autopsy/report/reportPanel.java
@@ -12,8 +12,9 @@ package org.sleuthkit.autopsy.report;
 import java.awt.event.ActionListener;
 import java.io.BufferedWriter;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 import org.jdom.output.XMLOutputter;
 
 /**
@@ -128,8 +129,10 @@ private void saveReportActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
        String htmlpath = reportUtils.changeExtension(path, ".html");
        String xmlpath = reportUtils.changeExtension(path, ".xml");
          try {
-                  FileOutputStream out = new FileOutputStream(htmlpath);
-                  out.write(reportHTML.formatted_header.toString().getBytes());
+                   Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(htmlpath), "UTF-8"));
+                   
+                 // FileOutputStream out = new FileOutputStream(htmlpath);
+                  out.write(reportHTML.formatted_header.toString());
                   out.flush();
                   out.close();
                   
diff --git a/Report/src/org/sleuthkit/autopsy/report/reportPanelAction.java b/Report/src/org/sleuthkit/autopsy/report/reportPanelAction.java
index a317cbf773..56906c2ef0 100644
--- a/Report/src/org/sleuthkit/autopsy/report/reportPanelAction.java
+++ b/Report/src/org/sleuthkit/autopsy/report/reportPanelAction.java
@@ -33,7 +33,7 @@ public class reportPanelAction {
          try {
              //Clear any old reports in the string
              viewReport.setLength(0);
-             done = false;
+             
             // Generate the reports and create the hashmap
         final HashMap<BlackboardArtifact,ArrayList<BlackboardAttribute>> Results = new HashMap();
          report bbreport = new report();
@@ -49,6 +49,7 @@ public class reportPanelAction {
              if(reportlist.contains(9)){Results.putAll(bbreport.getKeywordHit());}
              if(reportlist.contains(10)){Results.putAll(bbreport.getHashHit());}
               SwingUtilities.invokeLater(new Runnable() {
+                @Override
                 public void run() {
                  rr.progBarCount(2*Results.size());
                  }});
@@ -56,6 +57,7 @@ public class reportPanelAction {
          //TODO: add a way for users to select what they will run when
              Thread xmlthread = new Thread(new Runnable()
                 {
+                @Override
                    public void run()
                    { 
                     reportXML xmlReport = new reportXML(Results, rr); 
@@ -63,6 +65,7 @@ public class reportPanelAction {
                 });
               Thread htmlthread = new Thread(new Runnable()
                 {
+                @Override
                    public void run()
                    { 
                     reportHTML htmlReport = new reportHTML(Results,rr);
@@ -88,7 +91,7 @@ public class reportPanelAction {
             //Set the temporary label to let the user know its done and is waiting on the report
             rr.progBarText();
             reportPanel panel = new reportPanel(viewReport.toString());
-              
+            
            
              panel.setjButton1ActionListener(new ActionListener() {