From 1a987048afe2eb82a602dad7ffd4c8c5aaef6ad3 Mon Sep 17 00:00:00 2001 From: Alex Ebadirad Date: Thu, 2 Feb 2012 12:58:38 -0700 Subject: [PATCH] Merges for IE fix and removing hardcoded values from blackboard attributes types, using enum instead Signed-off-by: Alex Ebadirad --- .../src/org/sleuthkit/autopsy/recentactivity/Chrome.java | 7 ++++++- .../org/sleuthkit/autopsy/recentactivity/ExtractIE.java | 2 ++ .../src/org/sleuthkit/autopsy/recentactivity/Firefox.java | 8 ++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java index e3448d9026..49363c2077 100755 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java @@ -83,6 +83,8 @@ public class Chrome { bbart.addAttribute(bbattref); BlackboardAttribute bbatttitle = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(),"RecentActivity","Chrome",((temprs.getString("title") != null) ? temprs.getString("title") : "No Title")); bbart.addAttribute(bbatttitle); + BlackboardAttribute bbattprog = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),"RecentActivity","Chrome","Chrome"); + bbart.addAttribute(bbattprog); als.add(kvs); @@ -149,7 +151,8 @@ public class Chrome { bbart.addAttribute(bbattvalue); BlackboardAttribute bbatttitle = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(), "RecentActivity","Chrome",((temprs.getString("name") != null) ? temprs.getString("name") : "No name")); bbart.addAttribute(bbatttitle); - + BlackboardAttribute bbattprog = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),"RecentActivity","Chrome","Chrome"); + bbart.addAttribute(bbattprog); } tempdbconnect.closeConnection(); @@ -210,6 +213,8 @@ public class Chrome { bbart.addAttribute(bbatturl); BlackboardAttribute bbatttitle = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(), "RecentActivity","Chrome", ((temprs.getString("title") != null) ? temprs.getString("title").replaceAll("'", "''") : "No Title")); bbart.addAttribute(bbatttitle); + BlackboardAttribute bbattprog = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),"RecentActivity","Chrome","Chrome"); + bbart.addAttribute(bbattprog); bookmarks.add(kvs); diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java index b9984544df..bd1e6fc9f3 100755 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java @@ -246,6 +246,8 @@ public class ExtractIE { // implements BrowserActivity { bbart.addAttribute(bbattref); BlackboardAttribute bbatttitle = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(), "RecentActivity", "Internet Explorer", lineBuff[2]); bbart.addAttribute(bbatttitle); + BlackboardAttribute bbattprog = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),"RecentActivity","Internet Explorer","Internet Explorer"); + bbart.addAttribute(bbattprog); //KeyValueThing //This will be redundant in terms IE.name() because of diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java index cc71bace37..9023df22b7 100755 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java @@ -83,6 +83,8 @@ public class Firefox { bbart.addAttribute(bbattref); BlackboardAttribute bbatttitle = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(),"RecentActivity","FireFox",((temprs.getString("title") != null) ? temprs.getString("title") : "No Title")); bbart.addAttribute(bbatttitle); + BlackboardAttribute bbattprog = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),"RecentActivity","FireFox","FireFox"); + bbart.addAttribute(bbattprog); //bbart.addAttribute(ATTRIBUTE_TYPE.TSK_URL, temprs.getString("url"), "RecentActivity","FireFox"); //bbart.addAttribute(ATTRIBUTE_TYPE.TSK_DATETIME, temprs.getString("visit_date"), "RecentActivity","FireFox"); //bbart.addAttribute(ATTRIBUTE_TYPE.TSK_REFERRER, temprs.getString("from_visit"), "RecentActivity","FireFox"); @@ -105,7 +107,8 @@ public class Firefox { bbart.addAttribute(bbatturl); BlackboardAttribute bbatttitle = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(), "RecentActivity","FireFox", ((temprs.getString("title") != null) ? temprs.getString("title").replaceAll("'", "''") : "No Title")); bbart.addAttribute(bbatttitle); - + BlackboardAttribute bbattprog = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),"RecentActivity","FireFox","FireFox"); + bbart.addAttribute(bbattprog); bookmarks.add(kvs); } @@ -171,7 +174,8 @@ public class Firefox { bbart.addAttribute(bbattvalue); BlackboardAttribute bbatttitle = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(), "RecentActivity","FireFox",((temprs.getString("name") != null) ? temprs.getString("name") : "No name")); bbart.addAttribute(bbatttitle); - + BlackboardAttribute bbattprog = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),"RecentActivity","FireFox","FireFox"); + bbart.addAttribute(bbattprog); cookies.add(kvs);