mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-08 14:19:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix general HTML report bugs

Browse Source
This commit is contained in:
Devin148 2012-11-09 17:25:21 -05:00
parent 5eb9615cb1
commit 41b6f114dc
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Core/src/org/sleuthkit/autopsy/report/Report.java
View File

@ -38,6 +38,7 @@ import java.text.SimpleDateFormat;
import java.util.List;
import org.apache.commons.lang.StringEscapeUtils;
import org.openide.util.Exceptions;
import org.sleuthkit.datamodel.AbstractFile;
import org.sleuthkit.datamodel.TskCoreException;
public class Report {
@ -67,12 +68,12 @@ public class Report {
tempdbconnect.executeStmt("DROP TABLE IF EXISTS report_list;");
tempdbconnect.executeStmt("DROP TABLE IF EXISTS report_name;");
tempdbconnect.executeStmt("DROP TABLE IF EXISTS report;");
String temp1 = "CREATE TABLE report_keyword AS SELECT value_text as keyword,blackboard_attributes.attribute_type_id, blackboard_attributes.artifact_id FROM blackboard_attributes WHERE attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD.getTypeID() + ";";
String temp1 = "CREATE TABLE report_keyword AS SELECT value_text as keyword, blackboard_attributes.attribute_type_id, blackboard_attributes.artifact_id FROM blackboard_attributes WHERE attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD.getTypeID() + ";";
String temp2 = "CREATE TABLE report_preview AS SELECT value_text as preview, blackboard_attributes.attribute_type_id, blackboard_attributes.artifact_id FROM blackboard_attributes WHERE attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_PREVIEW.getTypeID() + ";";
String temp3 = "CREATE TABLE report_exp AS SELECT value_text as exp, blackboard_attributes.attribute_type_id, blackboard_attributes.artifact_id FROM blackboard_attributes WHERE attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_REGEXP.getTypeID() + ";";
String temp4 = "CREATE TABLE report_list AS SELECT value_text as list, blackboard_attributes.attribute_type_id, blackboard_attributes.artifact_id FROM blackboard_attributes WHERE attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID() + ";";
String temp5 = "CREATE TABLE report_name AS SELECT name, report_keyword.artifact_id from tsk_files,blackboard_artifacts, report_keyword WHERE blackboard_artifacts.artifact_id = report_keyword.artifact_id AND blackboard_artifacts.obj_id = tsk_files.obj_id;";
String temp6 = "CREATE TABLE report AS SELECT keyword,preview,exp,list,name from report_keyword "
String temp5 = "CREATE TABLE report_name AS SELECT name, report_keyword.artifact_id, tsk_files.obj_id as obj_id from tsk_files, blackboard_artifacts, report_keyword WHERE blackboard_artifacts.artifact_id = report_keyword.artifact_id AND blackboard_artifacts.obj_id = tsk_files.obj_id;";
String temp6 = "CREATE TABLE report AS SELECT keyword, preview, exp, list, name, obj_id from report_keyword "
+ "LEFT JOIN report_preview ON report_keyword.artifact_id=report_preview.artifact_id "
+ "LEFT JOIN report_exp ON report_keyword.artifact_id=report_exp.artifact_id "
+ "LEFT JOIN report_list ON report_keyword.artifact_id=report_list.artifact_id "
@ -83,20 +84,27 @@ public class Report {
tempdbconnect.executeStmt(temp4);
tempdbconnect.executeStmt(temp5);
tempdbconnect.executeStmt(temp6);
ResultSet uniqueresults = tempdbconnect.executeQry("SELECT keyword, exp, preview, list, name FROM report ORDER BY keyword ASC");
ResultSet uniqueresults = tempdbconnect.executeQry("SELECT keyword, exp, preview, list, name, obj_id FROM report ORDER BY keyword ASC");
String keyword = "";
while (uniqueresults.next()) {
Long objId = uniqueresults.getLong("obj_id");
AbstractFile file = null;
try {
file = tempDb.getAbstractFileById(objId);
} catch (TskCoreException ex) {
logger.log(Level.WARNING, "Could not get AbstractFile from TSK ", ex);
}
StringBuilder table = new StringBuilder();
if (uniqueresults.getString("keyword") == null ? keyword == null : uniqueresults.getString("keyword").equals(keyword)) {
} else {
table.append("</tbody></table><br /><br />\n");
keyword = uniqueresults.getString("keyword");
table.append("<strong>").append(keyword).append("</strong>\n");
table.append("<table><thead><tr><th>").append("File Name").append("</th><th>Preview</th><th>Keyword List</th></tr><tbody>\n");
table.append("<table><thead><tr><th>").append("File Name").append("</th><th>Preview</th><th>Keyword List</th><th>Path</th></tr><tbody>\n");
}
table.append("<tr><td>").append(uniqueresults.getString("name")).append("</td>\n");
String previewreplace = StringEscapeUtils.escapeHtml(uniqueresults.getString("preview"));
table.append("<td>").append(previewreplace.replaceAll("<!", "")).append("</td>").append("<td>").append(uniqueresults.getString("list")).append("<br />(").append(uniqueresults.getString("exp") == null ? keyword : uniqueresults.getString("exp")).append(")").append("</td>").append("</tr>\n");
table.append("<td>").append(previewreplace.replaceAll("<!", "")).append("</td>").append("<td>").append(uniqueresults.getString("list")).append("<br />(").append(uniqueresults.getString("exp") == null ? keyword : uniqueresults.getString("exp")).append(")").append("</td>").append("<td>").append(file != null ? file.getUniquePath() : "").append("</td>").append("</tr>\n");
out.write(table.toString());
}
tempdbconnect.executeStmt("DROP TABLE IF EXISTS report_keyword;");

18
Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
View File

@ -328,7 +328,7 @@ public class ReportHTML implements ReportModule {
nav.append("<li><a href=\"history.html\" target=\"content\">Web History (").append(countHistory).append(")</a></li>\n");
}
if(countDownloads > 0) {
nav.append("<li><a href=\"downloads.html\" target=\"content\">Downloads (").append(countDownloads).append(")</a></li>\n");
nav.append("<li><a href=\"downloads.html\" target=\"content\">Web Downloads (").append(countDownloads).append(")</a></li>\n");
}
if(countRecent > 0) {
nav.append("<li><a href=\"recent.html\" target=\"content\">Recent Documents (").append(countRecent).append(")</a></li>\n");
@ -448,13 +448,9 @@ public class ReportHTML implements ReportModule {
*/
private TreeMap<Integer, String> getAttributes(List<BlackboardAttribute> attList) {
TreeMap<Integer, String> attributes = new TreeMap<Integer, String>();
try {
int size = skCase.getBlackboardAttributeTypes().size();
for (int n = 0; n <= size; n++) {
attributes.put(n, "");
}
} catch(TskCoreException ex) {
logger.log(Level.WARNING, "Failed to fill in blank attributes with spaces, they will be shown as null.");
int size = BlackboardAttribute.ATTRIBUTE_TYPE.values().length;
for (int n = 0; n <= size; n++) {
attributes.put(n, "");
}
for (BlackboardAttribute tempatt : attList) {
if (ReportFilter.cancel == true) {
@ -668,7 +664,7 @@ public class ReportHTML implements ReportModule {
out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(folder + "downloads.html"), "UTF-8"));
out.write(generateHead("Web Download Artifacts (" + countDownloads + ")"));
String title = "<h3>Web Downloads (" + countDownloads + ")</h3>\n";
String tableHeader = getTableHead("File", "Source", "Time", "Program", "Path");
String tableHeader = getTableHead("URL", "Source", "Time", "Program", "Path");
out.write(title);
out.write(tableHeader);
@ -719,7 +715,7 @@ public class ReportHTML implements ReportModule {
out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(folder + "recent.html"), "UTF-8"));
out.write(generateHead("Recent Document Artifacts (" + countRecent + ")"));
String title = "<h3>Recent Documents (" + countRecent + ")</h3>\n";
String tableHeader = getTableHead("Name", "Path", "Related Shortcut");
String tableHeader = getTableHead("Name", "Related Shortcut", "Path");
out.write(title);
out.write(tableHeader);
@ -732,8 +728,8 @@ public class ReportHTML implements ReportModule {
StringBuilder row = new StringBuilder();
row.append("<tr>\n");
row.append("<td><strong>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_NAME.getTypeID())).append("</strong></td>\n");
row.append("<td>").append(file.getUniquePath()).append("</td>\n");
row.append("<td>").append(file != null ? file.getName() : "").append("</td>\n");
row.append("<td>").append(file.getUniquePath()).append("</td>\n");
row.append("</tr>\n");
out.write(row.toString());
}