Fixed some bugs in the analyzer UI and upload UI as well as version b…

…ump for TS Upload and Analyzer UI fixes
google · Jan 31, 2020 · 3476ac4 · 3476ac4
2 parents e150896 + 5ffc038
commit 3476ac4
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 33 deletions.
diff --git a/setup.py b/setup.py
@@ -34,7 +34,7 @@
     from pip.req import parse_requirements
 
 
-timesketch_version = '20191220-2'
+timesketch_version = '20200131'
 
 timesketch_description = (
     'Timesketch is a web based tool for collaborative forensic timeline '

diff --git a/...ontend/dist/css/chunk-common.d4d85507.css → ...ontend/dist/css/chunk-common.5e819e80.css b/...ontend/dist/css/chunk-common.d4d85507.css → ...ontend/dist/css/chunk-common.5e819e80.css
diff --git a/timesketch/frontend/dist/index.html b/timesketch/frontend/dist/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta name=csrf-token content="{{ csrf_token() }}"><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/dist/favicon.ico><title>Timesketch</title><link href=/dist/css/chunk-common.d4d85507.css rel=preload as=style><link href=/dist/css/chunk-vendors.534842e8.css rel=preload as=style><link href=/dist/js/chunk-common.fc247e53.js rel=preload as=script><link href=/dist/js/chunk-vendors.c957e138.js rel=preload as=script><link href=/dist/js/index.0c45ccdf.js rel=preload as=script><link href=/dist/css/chunk-vendors.534842e8.css rel=stylesheet><link href=/dist/css/chunk-common.d4d85507.css rel=stylesheet></head><body><div id=app></div><script src=/dist/js/chunk-vendors.c957e138.js></script><script src=/dist/js/chunk-common.fc247e53.js></script><script src=/dist/js/index.0c45ccdf.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta name=csrf-token content="{{ csrf_token() }}"><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/dist/favicon.ico><title>Timesketch</title><link href=/dist/css/chunk-common.5e819e80.css rel=preload as=style><link href=/dist/css/chunk-vendors.534842e8.css rel=preload as=style><link href=/dist/js/chunk-common.8ec05d5c.js rel=preload as=script><link href=/dist/js/chunk-vendors.c957e138.js rel=preload as=script><link href=/dist/js/index.0c45ccdf.js rel=preload as=script><link href=/dist/css/chunk-vendors.534842e8.css rel=stylesheet><link href=/dist/css/chunk-common.5e819e80.css rel=stylesheet></head><body><div id=app></div><script src=/dist/js/chunk-vendors.c957e138.js></script><script src=/dist/js/chunk-common.8ec05d5c.js></script><script src=/dist/js/index.0c45ccdf.js></script></body></html>
diff --git a/timesketch/frontend/dist/js/chunk-common.8ec05d5c.js b/timesketch/frontend/dist/js/chunk-common.8ec05d5c.js
diff --git a/timesketch/frontend/dist/js/chunk-common.8ec05d5c.js.map b/timesketch/frontend/dist/js/chunk-common.8ec05d5c.js.map
diff --git a/timesketch/frontend/dist/js/chunk-common.fc247e53.js b/timesketch/frontend/dist/js/chunk-common.fc247e53.js
diff --git a/timesketch/frontend/dist/js/chunk-common.fc247e53.js.map b/timesketch/frontend/dist/js/chunk-common.fc247e53.js.map
diff --git a/timesketch/frontend/dist/login.html b/timesketch/frontend/dist/login.html
@@ -15,4 +15,4 @@
         .card-content {
             justify-content: center;
             align-items: center;
-        }</style><link href=/dist/css/chunk-common.d4d85507.css rel=preload as=style><link href=/dist/css/chunk-vendors.534842e8.css rel=preload as=style><link href=/dist/js/chunk-common.fc247e53.js rel=preload as=script><link href=/dist/js/chunk-vendors.c957e138.js rel=preload as=script><link href=/dist/js/login.c1fa2383.js rel=preload as=script><link href=/dist/css/chunk-vendors.534842e8.css rel=stylesheet><link href=/dist/css/chunk-common.d4d85507.css rel=stylesheet></head><body class=login-page><div class=columns><div class=column><div class="card is-wide has-text-centered"><div class=card-content><div class=content><div><img src=/dist/timesketch-color.png style=width:40px;><div style="color: #333; font-size: 1.5em;">time<b>sketch</b></div><div style="color: #666; font-size: 0.8em;">Digital Forensic Timeline Analysis</div></div><br><form method=post style="width:50%;margin-left: auto; margin-right: auto;"><div class=field><div class=control><input type=text class=input name=username placeholder=Username style=text-align:center;></div></div><div class=field><div class=control><input type=password class=input name=password placeholder=Password style=text-align:center;></div></div><div class=field><div class="control has-text-centered"><button type=submit class="button is-rounded is-wide is-info" style=width:100%;>Sign in</button></div></div>{{ form.csrf_token }}</form></div></div></div></div></div><script src=/dist/js/chunk-vendors.c957e138.js></script><script src=/dist/js/chunk-common.fc247e53.js></script><script src=/dist/js/login.c1fa2383.js></script></body></html>
+        }</style><link href=/dist/css/chunk-common.5e819e80.css rel=preload as=style><link href=/dist/css/chunk-vendors.534842e8.css rel=preload as=style><link href=/dist/js/chunk-common.8ec05d5c.js rel=preload as=script><link href=/dist/js/chunk-vendors.c957e138.js rel=preload as=script><link href=/dist/js/login.c1fa2383.js rel=preload as=script><link href=/dist/css/chunk-vendors.534842e8.css rel=stylesheet><link href=/dist/css/chunk-common.5e819e80.css rel=stylesheet></head><body class=login-page><div class=columns><div class=column><div class="card is-wide has-text-centered"><div class=card-content><div class=content><div><img src=/dist/timesketch-color.png style=width:40px;><div style="color: #333; font-size: 1.5em;">time<b>sketch</b></div><div style="color: #666; font-size: 0.8em;">Digital Forensic Timeline Analysis</div></div><br><form method=post style="width:50%;margin-left: auto; margin-right: auto;"><div class=field><div class=control><input type=text class=input name=username placeholder=Username style=text-align:center;></div></div><div class=field><div class=control><input type=password class=input name=password placeholder=Password style=text-align:center;></div></div><div class=field><div class="control has-text-centered"><button type=submit class="button is-rounded is-wide is-info" style=width:100%;>Sign in</button></div></div>{{ form.csrf_token }}</form></div></div></div></div></div><script src=/dist/js/chunk-vendors.c957e138.js></script><script src=/dist/js/chunk-common.8ec05d5c.js></script><script src=/dist/js/login.c1fa2383.js></script></body></html>
diff --git a/timesketch/frontend/src/components/Sketch/AnalyzerHistory.vue b/timesketch/frontend/src/components/Sketch/AnalyzerHistory.vue
@@ -15,12 +15,15 @@ limitations under the License.
 -->
 <template>
   <div class="card" style="margin-top:15px;">
-    <header class="card-header">
+    <header class="card-header" style="background-color: #eaeaea;">
       <p class="card-header-title">
         Analysis history
       </p>
+      <span class="card-header-icon" aria-label="close">
+        <span class="delete" v-on:click="$emit('closeHistory')"></span>
+      </span>
     </header>
-    <div class="card-content">
+    <div class="card-content" style="background-color: #f7f7f7;">
       <b-table
         v-if="analyses"
         :data="analyses"

diff --git a/timesketch/frontend/src/components/Sketch/AnalyzerListDropdown.vue b/timesketch/frontend/src/components/Sketch/AnalyzerListDropdown.vue
@@ -19,7 +19,7 @@ limitations under the License.
       <span class="icon is-small">
         <i class="fas fa-play-circle"></i>
       </span>
-      <span>Analyzers</span>
+      <span>Analyze</span>
     </button>
     <b-dropdown-item aria-role="menu-item" :focusable="false" custom>
       <div class="modal-card" style="width:300px;">

diff --git a/timesketch/frontend/src/components/Sketch/AnalyzerSessionDetail.vue b/timesketch/frontend/src/components/Sketch/AnalyzerSessionDetail.vue
@@ -14,22 +14,32 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <template>
-  <b-message :title="messageTitle" :closable="false" style="margin-top:15px;">
-    <table class="table is-fullwidth">
-      <colgroup>
-        <col span="1" style="width: 5%;">
-        <col span="1" style="width: 15%;">
-        <col span="1" style="width: 80%;">
-      </colgroup>
-      <tbody>
-      <tr v-for="row in tableData">
-        <td><div style="width:10px; height: 10px; border-radius: 100%; margin-top:6px; margin-left:3px;" v-bind:class="{ pending: row.status === 'PENDING',  done: row.status === 'DONE', started: row.status === 'STARTED', error: row.status === 'ERROR'}"></div></td>
-        <td>{{row.analyzer}}</td>
-        <td>{{row.result}}</td>
-      </tr>
-      </tbody>
-    </table>
-  </b-message>
+  <div class="card" style="margin-top:15px;">
+    <header class="card-header" style="background-color: #eaeaea;">
+      <p class="card-header-title">
+        {{ messageTitle }}
+      </p>
+      <span class="card-header-icon" aria-label="close">
+        <span class="delete" v-on:click="$emit('closeDetail')"></span>
+      </span>
+    </header>
+    <div class="card-content" style="background-color: #f7f7f7;">
+      <table class="table is-fullwidth">
+        <colgroup>
+          <col span="1" style="width: 5%;">
+          <col span="1" style="width: 15%;">
+          <col span="1" style="width: 80%;">
+        </colgroup>
+        <tbody>
+        <tr v-for="row in tableData">
+          <td><div style="width:10px; height: 10px; border-radius: 100%; margin-top:6px; margin-left:3px;" v-bind:class="{ pending: row.status === 'PENDING',  done: row.status === 'DONE', started: row.status === 'STARTED', error: row.status === 'ERROR'}"></div></td>
+          <td>{{row.analyzer}}</td>
+          <td>{{row.result}}</td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -106,7 +116,6 @@ export default {
           this.fetchData()
           if (this.finishedAnalyzers === this.totalAnalyzers) {
             this.autoRefresh = false
-            this.$emit('sessionDone')
           }
         }.bind(this), 5000)}
       else {

diff --git a/timesketch/frontend/src/components/Sketch/TimelineListItem.vue b/timesketch/frontend/src/components/Sketch/TimelineListItem.vue
@@ -130,16 +130,14 @@ limitations under the License.
       Indexing in progress <span class="blink">...</span>
     </span>
 
-
-
     <br>
 
-    <div v-show="analysisSessionId">
-      <ts-analyzer-session-detail :timeline="timeline" :session-id="analysisSessionId" @sessionDone="analysisSessionId = false"></ts-analyzer-session-detail>
+    <div v-show="showAnalysisDetail">
+      <ts-analyzer-session-detail :timeline="timeline" :session-id="analysisSessionId" @closeDetail="showAnalysisDetail = false"></ts-analyzer-session-detail>
     </div>
 
     <div v-if="showAnalysisHistory">
-      <ts-analyzer-history :timeline="timeline"></ts-analyzer-history>
+      <ts-analyzer-history :timeline="timeline" @closeHistory="showAnalysisHistory = false"></ts-analyzer-history>
     </div>
 
   </div>
@@ -222,6 +220,7 @@ export default {
         if (this.timelineStatus !== 'ready') {
           this.autoRefresh = true
         }
+        this.$store.dispatch('updateSketch', this.$store.state.sketch.id)
       }).catch((e) => {})
     }
   },

diff --git a/timesketch/frontend/src/components/Sketch/UploadForm.vue b/timesketch/frontend/src/components/Sketch/UploadForm.vue
@@ -50,7 +50,9 @@ limitations under the License.
     </div>
   </form>
     <br>
-    <b-progress v-if="percentCompleted !== 0 && percentCompleted !== 100" :value="percentCompleted" show-value format="percent" type="is-info" size="is-medium"></b-progress>
+    <b-progress v-if="percentCompleted !== 0" :value="percentCompleted" show-value format="percent" type="is-info" size="is-medium">
+      <span v-if="percentCompleted === 100">Waiting for request to finish..</span>
+    </b-progress>
   </div>
 </template>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang=en><head><meta name=csrf-token content="{{ csrf_token() }}"><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/dist/favicon.ico><title>Timesketch</title><link href=/dist/css/chunk-common.d4d85507.css rel=preload as=style><link href=/dist/css/chunk-vendors.534842e8.css rel=preload as=style><link href=/dist/js/chunk-common.fc247e53.js rel=preload as=script><link href=/dist/js/chunk-vendors.c957e138.js rel=preload as=script><link href=/dist/js/index.0c45ccdf.js rel=preload as=script><link href=/dist/css/chunk-vendors.534842e8.css rel=stylesheet><link href=/dist/css/chunk-common.d4d85507.css rel=stylesheet></head><body><div id=app></div><script src=/dist/js/chunk-vendors.c957e138.js></script><script src=/dist/js/chunk-common.fc247e53.js></script><script src=/dist/js/index.0c45ccdf.js></script></body></html>
		<!DOCTYPE html><html lang=en><head><meta name=csrf-token content="{{ csrf_token() }}"><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/dist/favicon.ico><title>Timesketch</title><link href=/dist/css/chunk-common.5e819e80.css rel=preload as=style><link href=/dist/css/chunk-vendors.534842e8.css rel=preload as=style><link href=/dist/js/chunk-common.8ec05d5c.js rel=preload as=script><link href=/dist/js/chunk-vendors.c957e138.js rel=preload as=script><link href=/dist/js/index.0c45ccdf.js rel=preload as=script><link href=/dist/css/chunk-vendors.534842e8.css rel=stylesheet><link href=/dist/css/chunk-common.5e819e80.css rel=stylesheet></head><body><div id=app></div><script src=/dist/js/chunk-vendors.c957e138.js></script><script src=/dist/js/chunk-common.8ec05d5c.js></script><script src=/dist/js/index.0c45ccdf.js></script></body></html>