diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java index b6c06ee5d9..c5d347ae6e 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java @@ -112,6 +112,18 @@ public class ArtifactTypeNode extends DisplayableItemNode { return "calllog.png"; case TSK_CALENDAR_ENTRY: return "calendar.png"; + case TSK_SPEED_DIAL_ENTRY: + return "speeddialentry.png"; + case TSK_BLUETOOTH_PAIRING: + return "bluetooth.png"; + case TSK_GPS_BOOKMARK: + return "gpsfav.png"; + case TSK_GPS_LAST_KNOWN_LOCATION: + return "gps-lastlocation.png"; + case TSK_GPS_SEARCH: + return "gps-search.png"; + case TSK_SERVICE_ACCOUNT: + return "account-icon-16.png"; } return "artifact-icon.png"; } diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java index 8ecb85fb2f..5879d6f341 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java @@ -299,6 +299,19 @@ public class BlackboardArtifactNode extends DisplayableItemNode { return "calllog.png"; case TSK_CALENDAR_ENTRY: return "calendar.png"; + case TSK_SPEED_DIAL_ENTRY: + return "speeddialentry.png"; + case TSK_BLUETOOTH_PAIRING: + return "bluetooth.png"; + case TSK_GPS_BOOKMARK: + return "gpsfav.png"; + case TSK_GPS_LAST_KNOWN_LOCATION: + return "gps-lastlocation.png"; + case TSK_GPS_SEARCH: + return "gps-search.png"; + case TSK_SERVICE_ACCOUNT: + return "account-icon-16.png"; + } return "artifact-icon.png"; } diff --git a/Core/src/org/sleuthkit/autopsy/images/Bluetooth.png b/Core/src/org/sleuthkit/autopsy/images/Bluetooth.png new file mode 100644 index 0000000000..a54acb00a1 Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/Bluetooth.png differ diff --git a/Core/src/org/sleuthkit/autopsy/images/gps-lastlocation.png b/Core/src/org/sleuthkit/autopsy/images/gps-lastlocation.png new file mode 100644 index 0000000000..686407bbf8 Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/gps-lastlocation.png differ diff --git a/Core/src/org/sleuthkit/autopsy/images/gps-search.png b/Core/src/org/sleuthkit/autopsy/images/gps-search.png new file mode 100644 index 0000000000..26c97d4888 Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/gps-search.png differ diff --git a/Core/src/org/sleuthkit/autopsy/images/gps-trackpoint.png b/Core/src/org/sleuthkit/autopsy/images/gps-trackpoint.png new file mode 100644 index 0000000000..78f1f97dcc Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/gps-trackpoint.png differ diff --git a/Core/src/org/sleuthkit/autopsy/images/gpsfav.png b/Core/src/org/sleuthkit/autopsy/images/gpsfav.png new file mode 100644 index 0000000000..721dba3d50 Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/gpsfav.png differ diff --git a/Core/src/org/sleuthkit/autopsy/images/speeddialentry.png b/Core/src/org/sleuthkit/autopsy/images/speeddialentry.png new file mode 100644 index 0000000000..498c9e4bd2 Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/speeddialentry.png differ diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java index ea177fc38b..c96a602d31 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java @@ -724,6 +724,27 @@ public class ReportGenerator { case TSK_CALENDAR_ENTRY: columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Calendar Entry Type", "Description", "Start Date/Time", "End Date/Time", "Location", "Source File" })); break; + case TSK_SPEED_DIAL_ENTRY: + columnHeaders = new ArrayList(Arrays.asList(new String[] {"Dial String", "Person Name", "Phone Number", "Source File" })); + break; + case TSK_BLUETOOTH_PAIRING: + columnHeaders = new ArrayList(Arrays.asList(new String[] {"Device Name", "Device Address", "Date/Time", "Source File" })); + break; + case TSK_GPS_TRACKPOINT: + columnHeaders = new ArrayList(Arrays.asList(new String[] {"Latitude", "Longitude", "Altitude", "Name", "Location Address", "Date/Time", "Source File" })); + break; + case TSK_GPS_BOOKMARK: + columnHeaders = new ArrayList(Arrays.asList(new String[] {"Latitude", "Longitude", "Altitude", "Name", "Location Address", "Date/Time", "Source File" })); + break; + case TSK_GPS_LAST_KNOWN_LOCATION: + columnHeaders = new ArrayList(Arrays.asList(new String[] {"Latitude", "Longitude", "Altitude", "Name", "Location Address", "Date/Time", "Source File" })); + break; + case TSK_GPS_SEARCH: + columnHeaders = new ArrayList(Arrays.asList(new String[] {"Latitude", "Longitude", "Altitude", "Name", "Location Address", "Date/Time", "Source File" })); + break; + case TSK_SERVICE_ACCOUNT: + columnHeaders = new ArrayList(Arrays.asList(new String[] {"Category", "User ID", "Password", "Person Name", "App Name", "URL", "App Path", "Mailbox Name", "ReplyTo Address", "Mail Server", "Source File" })); + break; default: return null; } @@ -955,6 +976,75 @@ public class ReportGenerator { calEntry.add(attributes.get(ATTRIBUTE_TYPE.TSK_LOCATION.getTypeID())); calEntry.add(getFileUniquePath(entry.getKey().getObjectID())); return calEntry; + case TSK_SPEED_DIAL_ENTRY: + List speedDialEntry = new ArrayList(); + speedDialEntry.add(attributes.get(ATTRIBUTE_TYPE.TSK_DIAL_STRING.getTypeID())); + speedDialEntry.add(attributes.get(ATTRIBUTE_TYPE.TSK_NAME_PERSON.getTypeID())); + speedDialEntry.add(attributes.get(ATTRIBUTE_TYPE.TSK_PHONE_NUMBER.getTypeID())); + speedDialEntry.add(getFileUniquePath(entry.getKey().getObjectID())); + return speedDialEntry; + case TSK_BLUETOOTH_PAIRING: + List bluetoothEntry = new ArrayList(); + bluetoothEntry.add(attributes.get(ATTRIBUTE_TYPE.TSK_DEVICE_NAME.getTypeID())); + bluetoothEntry.add(attributes.get(ATTRIBUTE_TYPE.TSK_DEVICE_ID.getTypeID())); + bluetoothEntry.add(attributes.get(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID())); + bluetoothEntry.add(getFileUniquePath(entry.getKey().getObjectID())); + return bluetoothEntry; + case TSK_GPS_TRACKPOINT: + List gpsTrackpoint = new ArrayList(); + gpsTrackpoint.add(attributes.get(ATTRIBUTE_TYPE.TSK_GEO_LATITUDE.getTypeID())); + gpsTrackpoint.add(attributes.get(ATTRIBUTE_TYPE.TSK_GEO_LONGITUDE.getTypeID())); + gpsTrackpoint.add(attributes.get(ATTRIBUTE_TYPE.TSK_GEO_ALTITUDE.getTypeID())); + gpsTrackpoint.add(attributes.get(ATTRIBUTE_TYPE.TSK_NAME.getTypeID())); + gpsTrackpoint.add(attributes.get(ATTRIBUTE_TYPE.TSK_LOCATION.getTypeID())); + gpsTrackpoint.add(attributes.get(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID())); + gpsTrackpoint.add(getFileUniquePath(entry.getKey().getObjectID())); + return gpsTrackpoint; + case TSK_GPS_BOOKMARK: + List gpsBookmarkEntry = new ArrayList(); + gpsBookmarkEntry.add(attributes.get(ATTRIBUTE_TYPE.TSK_GEO_LATITUDE.getTypeID())); + gpsBookmarkEntry.add(attributes.get(ATTRIBUTE_TYPE.TSK_GEO_LONGITUDE.getTypeID())); + gpsBookmarkEntry.add(attributes.get(ATTRIBUTE_TYPE.TSK_GEO_ALTITUDE.getTypeID())); + gpsBookmarkEntry.add(attributes.get(ATTRIBUTE_TYPE.TSK_NAME.getTypeID())); + gpsBookmarkEntry.add(attributes.get(ATTRIBUTE_TYPE.TSK_LOCATION.getTypeID())); + gpsBookmarkEntry.add(attributes.get(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID())); + gpsBookmarkEntry.add(getFileUniquePath(entry.getKey().getObjectID())); + return gpsBookmarkEntry; + case TSK_GPS_LAST_KNOWN_LOCATION: + List gpsLastLocation = new ArrayList(); + gpsLastLocation.add(attributes.get(ATTRIBUTE_TYPE.TSK_GEO_LATITUDE.getTypeID())); + gpsLastLocation.add(attributes.get(ATTRIBUTE_TYPE.TSK_GEO_LONGITUDE.getTypeID())); + gpsLastLocation.add(attributes.get(ATTRIBUTE_TYPE.TSK_GEO_ALTITUDE.getTypeID())); + gpsLastLocation.add(attributes.get(ATTRIBUTE_TYPE.TSK_NAME.getTypeID())); + gpsLastLocation.add(attributes.get(ATTRIBUTE_TYPE.TSK_LOCATION.getTypeID())); + gpsLastLocation.add(attributes.get(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID())); + gpsLastLocation.add(getFileUniquePath(entry.getKey().getObjectID())); + return gpsLastLocation; + case TSK_GPS_SEARCH: + List gpsSearch = new ArrayList(); + gpsSearch.add(attributes.get(ATTRIBUTE_TYPE.TSK_GEO_LATITUDE.getTypeID())); + gpsSearch.add(attributes.get(ATTRIBUTE_TYPE.TSK_GEO_LONGITUDE.getTypeID())); + gpsSearch.add(attributes.get(ATTRIBUTE_TYPE.TSK_GEO_ALTITUDE.getTypeID())); + gpsSearch.add(attributes.get(ATTRIBUTE_TYPE.TSK_NAME.getTypeID())); + gpsSearch.add(attributes.get(ATTRIBUTE_TYPE.TSK_LOCATION.getTypeID())); + gpsSearch.add(attributes.get(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID())); + gpsSearch.add(getFileUniquePath(entry.getKey().getObjectID())); + return gpsSearch; + case TSK_SERVICE_ACCOUNT: + List appAccount = new ArrayList(); + appAccount.add(attributes.get(ATTRIBUTE_TYPE.TSK_CATEGORY.getTypeID())); + appAccount.add(attributes.get(ATTRIBUTE_TYPE.TSK_USER_ID.getTypeID())); + appAccount.add(attributes.get(ATTRIBUTE_TYPE.TSK_PASSWORD.getTypeID())); + appAccount.add(attributes.get(ATTRIBUTE_TYPE.TSK_NAME.getTypeID())); + appAccount.add(attributes.get(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID())); + appAccount.add(attributes.get(ATTRIBUTE_TYPE.TSK_URL.getTypeID())); + appAccount.add(attributes.get(ATTRIBUTE_TYPE.TSK_PATH.getTypeID())); + appAccount.add(attributes.get(ATTRIBUTE_TYPE.TSK_MAILBOX_NAME.getTypeID())); + appAccount.add(attributes.get(ATTRIBUTE_TYPE.TSK_EMAIL_REPLYTO.getTypeID())); + appAccount.add(attributes.get(ATTRIBUTE_TYPE.TSK_SERVER_NAME.getTypeID())); + appAccount.add(getFileUniquePath(entry.getKey().getObjectID())); + return appAccount; + } return null; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java index 86506f0777..60bb186c0a 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java @@ -770,6 +770,43 @@ public class ReportHTML implements TableReportModule { in.close(); output.close(); + in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/report/images/speeddialentry.png"); + output = new FileOutputStream(new File(path + File.separator + "Speed Dial Entries.png")); + FileUtil.copy(in, output); + in.close(); + output.close(); + + in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/report/images/bluetooth.png"); + output = new FileOutputStream(new File(path + File.separator + "BlueTooth.png")); + FileUtil.copy(in, output); + in.close(); + output.close(); + + in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/report/images/gpsfav.png"); + output = new FileOutputStream(new File(path + File.separator + "GPS Bookmarks.png")); + FileUtil.copy(in, output); + in.close(); + output.close(); + + in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/report/images/gps-lastlocation.png"); + output = new FileOutputStream(new File(path + File.separator + "GPS Last Location.png")); + FileUtil.copy(in, output); + in.close(); + output.close(); + + in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/report/images/gps-search.png"); + output = new FileOutputStream(new File(path + File.separator + "GPS Search.png")); + FileUtil.copy(in, output); + in.close(); + output.close(); + + in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/report/images/account-icon-16.png"); + output = new FileOutputStream(new File(path + File.separator + "Accounts.png")); + FileUtil.copy(in, output); + in.close(); + output.close(); + + } catch (IOException ex) { logger.log(Level.SEVERE, "Failed to extract images for HTML report.", ex); diff --git a/Core/src/org/sleuthkit/autopsy/report/images/account-icon-16.png b/Core/src/org/sleuthkit/autopsy/report/images/account-icon-16.png new file mode 100644 index 0000000000..73d9cfeabb Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/report/images/account-icon-16.png differ diff --git a/Core/src/org/sleuthkit/autopsy/report/images/bluetooth.png b/Core/src/org/sleuthkit/autopsy/report/images/bluetooth.png new file mode 100644 index 0000000000..a54acb00a1 Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/report/images/bluetooth.png differ diff --git a/Core/src/org/sleuthkit/autopsy/report/images/gps-lastlocation.png b/Core/src/org/sleuthkit/autopsy/report/images/gps-lastlocation.png new file mode 100644 index 0000000000..686407bbf8 Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/report/images/gps-lastlocation.png differ diff --git a/Core/src/org/sleuthkit/autopsy/report/images/gps-search.png b/Core/src/org/sleuthkit/autopsy/report/images/gps-search.png new file mode 100644 index 0000000000..26c97d4888 Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/report/images/gps-search.png differ diff --git a/Core/src/org/sleuthkit/autopsy/report/images/gps_trackpoint.png b/Core/src/org/sleuthkit/autopsy/report/images/gps_trackpoint.png new file mode 100644 index 0000000000..78f1f97dcc Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/report/images/gps_trackpoint.png differ diff --git a/Core/src/org/sleuthkit/autopsy/report/images/gpsfav.png b/Core/src/org/sleuthkit/autopsy/report/images/gpsfav.png new file mode 100644 index 0000000000..721dba3d50 Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/report/images/gpsfav.png differ diff --git a/Core/src/org/sleuthkit/autopsy/report/images/speeddialentry.png b/Core/src/org/sleuthkit/autopsy/report/images/speeddialentry.png new file mode 100644 index 0000000000..498c9e4bd2 Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/report/images/speeddialentry.png differ diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties index 89f5fc6173..8d7719d668 100644 --- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Thu, 25 Jul 2013 15:34:25 -0400 +#Wed, 07 Aug 2013 08:19:27 -0400 LBL_splash_window_title=Starting Autopsy SPLASH_HEIGHT=288 SPLASH_WIDTH=538 @@ -8,4 +8,4 @@ SplashRunningTextBounds=5,266,530,17 SplashRunningTextColor=0x0 SplashRunningTextFontSize=18 -currentVersion=Autopsy 20130725 +currentVersion=Autopsy 20130807 diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index cb822f501c..e718444a20 100644 --- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Thu, 25 Jul 2013 15:34:25 -0400 +#Wed, 07 Aug 2013 08:19:27 -0400 -CTL_MainWindow_Title=Autopsy 20130725 -CTL_MainWindow_Title_No_Project=Autopsy 20130725 +CTL_MainWindow_Title=Autopsy 20130807 +CTL_MainWindow_Title_No_Project=Autopsy 20130807