From e15686808126ed256686b5180d6947d24a2b2f08 Mon Sep 17 00:00:00 2001
From: wajihyassine <wajihyassine@gmail.com>
Date: Tue, 13 Aug 2024 20:56:19 +0000
Subject: [PATCH 1/4] Add button next to evidence name to download

---
 web/src/components/TaskDetails.vue | 36 +++++++++++++++++++++++++++++-
 web/src/components/TaskList.vue    |  2 +-
 web/src/utils/RestApiClient.js     |  5 +++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/web/src/components/TaskDetails.vue b/web/src/components/TaskDetails.vue
index b00ceb71b..6443d4360 100644
--- a/web/src/components/TaskDetails.vue
+++ b/web/src/components/TaskDetails.vue
@@ -99,6 +99,20 @@ limitations under the License.
             <div v-else>N/A</div>
           </v-list-item>
           <v-list-item title="Evidence Name:">
+            <template v-slot:append>
+              <v-tooltip location="top" text="Download Evidence output">
+                <template v-slot:activator="{ props: tooltip }">
+                  <v-btn icon="mdi-download" v-bind="tooltip" @click="downloadEvidence(taskDetails.evidence_id)">
+                  </v-btn>
+                </template>
+              </v-tooltip>
+            </template>
+            <v-snackbar v-model="evidenceSnackbar" color="primary" location="top" height="55" timeout="2000"> 
+              Evidence output is downloading...
+            </v-snackbar>
+            <v-snackbar v-model="notCopyable" color="red" location="top" height="55" timeout="2000"> 
+              Evidence type is not supported for downloading.
+            </v-snackbar>
             <div v-if="taskDetails.evidence_name">
               {{ taskDetails.evidence_name }}
             </div>
@@ -170,7 +184,9 @@ export default {
     return {
       openGroups: ['ids', 'details'],
       markdownReport: '',
-      currentTaskID: ''
+      currentTaskID: '',
+      evidenceSnackbar: false,
+      notCopyable: false,
     }
   },
   methods: {
@@ -205,6 +221,24 @@ export default {
           console.error(e)
         })
     },
+    downloadEvidence: function (evidence_id) {
+      ApiClient.downloadEvidence(evidence_id)
+        .then(({ data }) => {
+          this.evidenceSnackbar = true
+          const downloadObj = window.URL.createObjectURL(new Blob([data]))
+          const link = document.createElement('a')
+          link.href = downloadObj
+          link.setAttribute('download', evidence_id)
+          document.body.appendChild(link)
+          link.click()
+          link.remove()
+        })
+        .catch((e) => {
+          console.error(e)
+          this.evidenceSnackbar = false
+          this.notCopyable = true
+        })
+    },
   },
 }
 </script>
diff --git a/web/src/components/TaskList.vue b/web/src/components/TaskList.vue
index 480ed4139..1b6171ac1 100644
--- a/web/src/components/TaskList.vue
+++ b/web/src/components/TaskList.vue
@@ -15,7 +15,7 @@ limitations under the License.
   <div>
     <v-list density="compact">
       <v-empty-state v-if="taskList.length === 0"
-        text="No Tasks are available. Try adjusting your filters."
+        text="No Tasks are available. Try adjusting your filters.">
       </v-empty-state>
       <v-virtual-scroll :items="taskList" :item-height="40" :height="400" v-else>
         <template v-slot:default="{ item }">
diff --git a/web/src/utils/RestApiClient.js b/web/src/utils/RestApiClient.js
index a12e2b228..eddd4a662 100644
--- a/web/src/utils/RestApiClient.js
+++ b/web/src/utils/RestApiClient.js
@@ -67,6 +67,11 @@ export default {
     return RestApiClient.get('/api/result/task/' + task_id, { responseType: 'blob' })
   },
 
+  // Download Evidence
+  downloadEvidence(evidence_id) {
+    return RestApiClient.get('/api/evidence/download/' + evidence_id, { responseType: 'blob' })
+  },
+  
   // Jobs List
   getAvailableJobs() {
     return RestApiClient.get('/api/jobs/')

From ae1a8c7410add1259a5962f4ea2884bff05abbe8 Mon Sep 17 00:00:00 2001
From: wajihyassine <wajihyassine@gmail.com>
Date: Tue, 13 Aug 2024 21:01:15 +0000
Subject: [PATCH 2/4] Update icon add if statement

---
 web/src/components/TaskDetails.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/components/TaskDetails.vue b/web/src/components/TaskDetails.vue
index 6443d4360..4632a4598 100644
--- a/web/src/components/TaskDetails.vue
+++ b/web/src/components/TaskDetails.vue
@@ -99,10 +99,10 @@ limitations under the License.
             <div v-else>N/A</div>
           </v-list-item>
           <v-list-item title="Evidence Name:">
-            <template v-slot:append>
+            <template v-if="taskDetails.evidence_name" v-slot:append>
               <v-tooltip location="top" text="Download Evidence output">
                 <template v-slot:activator="{ props: tooltip }">
-                  <v-btn icon="mdi-download" v-bind="tooltip" @click="downloadEvidence(taskDetails.evidence_id)">
+                  <v-btn icon="mdi-magnify-plus" v-bind="tooltip" @click="downloadEvidence(taskDetails.evidence_id)">
                   </v-btn>
                 </template>
               </v-tooltip>

From abe8876f26c3d7dc0745ce97fbd1ba4130592356 Mon Sep 17 00:00:00 2001
From: wajihyassine <wajihyassine@gmail.com>
Date: Wed, 14 Aug 2024 23:28:40 +0000
Subject: [PATCH 3/4] Add button to view worker logs

---
 .gitignore                         |  1 +
 turbinia/api/routes/logs.py        |  2 +-
 web/package-lock.json              |  7 ++++---
 web/src/components/TaskDetails.vue | 29 +++++++++++++++++++++++++++++
 web/src/utils/RestApiClient.js     |  5 +++++
 5 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index f0c45e519..e8419fb90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 */_build/
 /_sources/
 /.tox
+charts/
 
 # And don't care about the 'egg'.
 /turbinia.egg-info
diff --git a/turbinia/api/routes/logs.py b/turbinia/api/routes/logs.py
index 149a0f4fa..cf1316a99 100644
--- a/turbinia/api/routes/logs.py
+++ b/turbinia/api/routes/logs.py
@@ -71,7 +71,7 @@ async def get_turbinia_logs(
     return JSONResponse(content={'detail': 'Invalid hostname'}, status_code=404)
 
   if 'NODE_NAME' in os.environ:
-    log_name = f'{hostname}.{os.environ["NODE_NAME"]!s}'
+    log_name = f'{hostname}.{os.environ["NODE_NAME"]!s}.log'
   else:
     log_name = f'{hostname}.log'
   log_path = Path(config.LOG_DIR, log_name)
diff --git a/web/package-lock.json b/web/package-lock.json
index 67928d672..68d3fe15f 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -802,9 +802,10 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/axios": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.3.tgz",
-      "integrity": "sha512-Ar7ND9pU99eJ9GpoGQKhKf58GpUOgnzuaB7ueNQ5BMi0p+LZ5oaEnfF999fAArcTIBwXTCHAmGcHOZJaWPq9Nw==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+      "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
+      "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
diff --git a/web/src/components/TaskDetails.vue b/web/src/components/TaskDetails.vue
index 4632a4598..f9931a484 100644
--- a/web/src/components/TaskDetails.vue
+++ b/web/src/components/TaskDetails.vue
@@ -137,6 +137,23 @@ limitations under the License.
             <div v-else>N/A</div>
           </v-list-item>
           <v-list-item title="Worker:">
+            <template v-if="taskDetails.worker_name" v-slot:append>
+              <v-tooltip location="top" text="View Worker Logs">
+                <template v-slot:activator="{ props: tooltip }">
+                  <v-btn icon="mdi-database-outline" v-bind="tooltip" @click="getWorkerLogs(taskDetails.worker_name)">
+                  </v-btn>
+                </template>
+              </v-tooltip>
+            </template>
+            <v-dialog v-if="this.workerLogs" v-model="openReportDialog" width="auto">
+              <v-card class="markdown-body pa-4 ps-12 ga-3">
+                <pre>
+                  <code>
+                    {{ this.workerLogs  }}
+                  </code>
+                </pre>
+              </v-card>
+            </v-dialog>
             <div v-if="taskDetails.worker_name">
               {{ taskDetails.worker_name }}
             </div>
@@ -185,8 +202,10 @@ export default {
       openGroups: ['ids', 'details'],
       markdownReport: '',
       currentTaskID: '',
+      workerLogs: '',
       evidenceSnackbar: false,
       notCopyable: false,
+      openReportDialog: false,
     }
   },
   methods: {
@@ -239,6 +258,16 @@ export default {
           this.notCopyable = true
         })
     },
+    getWorkerLogs: function (worker_name) {
+      ApiClient.getWorkerLogs(worker_name)
+        .then(({ data }) => {
+          this.workerLogs = data
+          this.openReportDialog = true
+        })
+        .catch((e) => {
+          console.error(e)
+        })
+    },
   },
 }
 </script>
diff --git a/web/src/utils/RestApiClient.js b/web/src/utils/RestApiClient.js
index eddd4a662..62429826c 100644
--- a/web/src/utils/RestApiClient.js
+++ b/web/src/utils/RestApiClient.js
@@ -72,6 +72,11 @@ export default {
     return RestApiClient.get('/api/evidence/download/' + evidence_id, { responseType: 'blob' })
   },
   
+  // Get Worker Logs
+  getWorkerLogs(worker_name) {
+    return RestApiClient.get('/api/logs/' + worker_name)
+  },
+  
   // Jobs List
   getAvailableJobs() {
     return RestApiClient.get('/api/jobs/')

From ef5e63607a13aa7887ce6d65406fd434f95d77fe Mon Sep 17 00:00:00 2001
From: wajihyassine <wajihyassine@gmail.com>
Date: Fri, 23 Aug 2024 20:14:05 +0000
Subject: [PATCH 4/4] Update download worker logs

---
 web/src/components/TaskDetails.vue | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/web/src/components/TaskDetails.vue b/web/src/components/TaskDetails.vue
index f9931a484..31c6095f1 100644
--- a/web/src/components/TaskDetails.vue
+++ b/web/src/components/TaskDetails.vue
@@ -138,22 +138,13 @@ limitations under the License.
           </v-list-item>
           <v-list-item title="Worker:">
             <template v-if="taskDetails.worker_name" v-slot:append>
-              <v-tooltip location="top" text="View Worker Logs">
+              <v-tooltip location="top" text="Download Worker Logs (defaults to most recent 500 entries)">
                 <template v-slot:activator="{ props: tooltip }">
-                  <v-btn icon="mdi-database-outline" v-bind="tooltip" @click="getWorkerLogs(taskDetails.worker_name)">
+                  <v-btn icon="mdi-database-outline" v-bind="tooltip" @click="downloadWorkerLogs(taskDetails.worker_name)">
                   </v-btn>
                 </template>
               </v-tooltip>
             </template>
-            <v-dialog v-if="this.workerLogs" v-model="openReportDialog" width="auto">
-              <v-card class="markdown-body pa-4 ps-12 ga-3">
-                <pre>
-                  <code>
-                    {{ this.workerLogs  }}
-                  </code>
-                </pre>
-              </v-card>
-            </v-dialog>
             <div v-if="taskDetails.worker_name">
               {{ taskDetails.worker_name }}
             </div>
@@ -202,7 +193,6 @@ export default {
       openGroups: ['ids', 'details'],
       markdownReport: '',
       currentTaskID: '',
-      workerLogs: '',
       evidenceSnackbar: false,
       notCopyable: false,
       openReportDialog: false,
@@ -258,11 +248,16 @@ export default {
           this.notCopyable = true
         })
     },
-    getWorkerLogs: function (worker_name) {
+    downloadWorkerLogs: function (worker_name) {
       ApiClient.getWorkerLogs(worker_name)
         .then(({ data }) => {
-          this.workerLogs = data
-          this.openReportDialog = true
+          const downloadObj = window.URL.createObjectURL(new Blob([data]))
+          const link = document.createElement('a')
+          link.href = downloadObj
+          link.setAttribute('download', worker_name + '.log')
+          document.body.appendChild(link)
+          link.click()
+          link.remove()
         })
         .catch((e) => {
           console.error(e)