From b520cb66b6dc0690a5d70d334a49ff72e3882c61 Mon Sep 17 00:00:00 2001
From: APriestman <apriestman@basistech.com>
Date: Tue, 27 Jan 2015 13:34:52 -0500
Subject: [PATCH] Added TSK_REMOTE_DRIVE artifacts to report.

---
 .../sleuthkit/autopsy/report/Bundle.properties    |   2 ++
 .../sleuthkit/autopsy/report/ReportGenerator.java |  10 ++++++++++
 .../org/sleuthkit/autopsy/report/ReportHTML.java  |   3 +++
 .../autopsy/report/images/drive_network.png       | Bin 0 -> 585 bytes
 4 files changed, 15 insertions(+)
 create mode 100644 Core/src/org/sleuthkit/autopsy/report/images/drive_network.png

diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
index f440813e43..6701d22617 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
@@ -176,6 +176,8 @@ ReportGenerator.artTableColHdr.appPath=App Path
 ReportGenerator.artTableColHdr.replytoAddress=ReplyTo Address
 ReportGenerator.artTableColHdr.mailServer=Mail Server
 ReportGenerator.artTableColHdr.tags=Tags
+ReportGenerator.artTableColHdr.localPath=Local path
+ReportGenerator.artTableColHdr.remotePath=Remote path
 ReportGenerator.errors.reportErrorTitle=Error generating report
 ReportGenerator.errors.reportErrorText=Error generating report: 
 ReportHTML.link.viewFile=View File
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
index 6d102bc5b9..5daad8c77f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
@@ -1384,6 +1384,12 @@ import org.sleuthkit.datamodel.TskData;
                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.userName"), //TSK_USER_NAME
                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.userId")})); //TSK_USER_ID
                 break;
+                
+            case TSK_REMOTE_DRIVE:
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[]{
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.localPath"), //TSK_LOCAL_PATH
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.remotePath")})); //TSK_REMOTE_PATH
+                break;
             default:
                 return null;
         }
@@ -1789,6 +1795,10 @@ import org.sleuthkit.datamodel.TskData;
                     orderedRowData.add(mappedAttributes.get(ATTRIBUTE_TYPE.TSK_USER_NAME.getTypeID()));
                     orderedRowData.add(mappedAttributes.get(ATTRIBUTE_TYPE.TSK_USER_ID.getTypeID()));
                     break;
+                case TSK_REMOTE_DRIVE:
+                    orderedRowData.add(mappedAttributes.get(ATTRIBUTE_TYPE.TSK_LOCAL_PATH.getTypeID()));
+                    orderedRowData.add(mappedAttributes.get(ATTRIBUTE_TYPE.TSK_REMOTE_PATH.getTypeID()));
+                    break;
             }
             orderedRowData.add(makeCommaSeparatedList(getTags()));
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
index 257cdb732a..67a2cbbbf5 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
@@ -254,6 +254,9 @@ import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM;
                 case TSK_PROG_RUN:
                      in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/report/images/installed.png"); //NON-NLS
                     break;
+                case TSK_REMOTE_DRIVE:
+                     in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/report/images/drive_network.png"); //NON-NLS
+                    break;    
                 default:
                     logger.log(Level.WARNING, "useDataTypeIcon: unhandled artifact type = " + dataType); //NON-NLS
                     in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/report/images/star.png"); //NON-NLS
diff --git a/Core/src/org/sleuthkit/autopsy/report/images/drive_network.png b/Core/src/org/sleuthkit/autopsy/report/images/drive_network.png
new file mode 100644
index 0000000000000000000000000000000000000000..63d2d5d5b14db0e985bdb96dd5796ae920b7f8a9
GIT binary patch
literal 585
zcmV-P0=E5$P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz+et)0R5;6Z
zQoX7gQ4pTv?)u9bSW$_fg%&9!PhfFDn><6hU?<w#R^lVv#s^53S5OH46gIZOCWs;^
zTqRX3*57q=zH{#^i+Aq_!<jiV-^`pjBV5-dU^<-+9LK3%uUC>M;q=Spa`EfKdc9r)
zPauILKg43Oaj{sW^Z88o;39xw7&ID<XuV$7n$6}=$ED2Lu`G+W+bu;R5s&02Lf>pQ
zluRb6R4UPOxopepp_oi25Ak?>TqqQ1zu&74SkNwrLI~0{O;tBdlM;yp4F&^RtyVQ%
zzNeE;r_~z~6pcoeaCLttIB&Nb9gjyUm&-Jt&)Yhx91aKC?RI3_wnu<)2Ot3`0$bO0
z%49Oij|5dzp3P>eRVL#Jp-{+605bal3|!t-b^e}wK2N99Nd-fY6h3?@&jB`ku$iax
zzssqrikyIF!U<q=M*w0}0yt8s6jdq}FPMX1b1=w$e=e8v67+k$-WP7^ZsXo;ByTBB
zDShEz7DlVp`Wz02e`m8<Wy`I*b-P`S0w5ZVh8yG{En=TFORc5h{Ii8)n?Ye}m9d)l
zSS%LtVzr_4&9Cp~J25W_pxooHTey6%9fNflWCT7TXa>N?uYaE8@$J?8@%;1CV^G|G
XPW_rzx-w*Y00000NkvXXu0mjf+4B7p

literal 0
HcmV?d00001