From c14672d6cd6dcc6d5103b63ff65021faa36ea174 Mon Sep 17 00:00:00 2001
From: Gabriel Martinez <144209867+NightAcrobat777@users.noreply.github.com>
Date: Wed, 25 Oct 2023 02:08:31 -0700
Subject: [PATCH 1/4] Support emojis in new UI (#2951)

* fix issue 2802 - emoji support in the new UI

---------

Co-authored-by: Janosch <99879757+jkppr@users.noreply.github.com>
---
 timesketch/frontend-ng/src/components/Explore/EventList.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/timesketch/frontend-ng/src/components/Explore/EventList.vue b/timesketch/frontend-ng/src/components/Explore/EventList.vue
index cdebfdc697..9d670ba071 100644
--- a/timesketch/frontend-ng/src/components/Explore/EventList.vue
+++ b/timesketch/frontend-ng/src/components/Explore/EventList.vue
@@ -359,14 +359,14 @@ limitations under the License.
                 <ts-event-tags :item="item" :tagConfig="tagConfig" :showDetails="item.showDetails"></ts-event-tags>
               </span>
               <!-- Emojis -->
-              <span v-if="displayOptions.showEmojis && index === 0">
+              <span v-if="displayOptions.showEmojis && index === 3">
                 <span
                   class="mr-2"
                   v-for="emoji in item._source.__ts_emojis"
                   :key="emoji"
-                  v-html="emoji"
+                  v-html="emoji + ';'"
                   :title="meta.emojis[emoji]"
-                  >{{ emoji }}
+                  >
                 </span>
               </span>
               <span>{{ item._source[field.text] }}</span>

From c7f5a91d30a7be3b919847177f3b8cdd92e4af5d Mon Sep 17 00:00:00 2001
From: Ataf Fazledin Ahamed <ataf@openrefactory.com>
Date: Wed, 25 Oct 2023 16:10:14 +0600
Subject: [PATCH 2/4] SSL/TLS support and authentication for SMTP (#2940)

* Added SSL/TLS support and authentication for SMTP

* Update timesketch/lib/utils.py

* Update data/timesketch.conf

* Update timesketch/lib/utils.py

* Update timesketch/lib/utils.py

---------

Co-authored-by: Johan Berggren <jberggren@gmail.com>
---
 data/timesketch.conf    |  8 ++++++++
 timesketch/lib/utils.py | 26 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/data/timesketch.conf b/data/timesketch.conf
index be412a30df..7918de6679 100644
--- a/data/timesketch.conf
+++ b/data/timesketch.conf
@@ -311,6 +311,14 @@ EMAIL_RECIPIENTS = []
 # Configuration to construct URLs for resources.
 EXTERNAL_HOST_URL = 'https://localhost'
 
+# SSL/TLS support for emails
+EMAIL_TLS = False
+EMAIL_SSL = False
+
+# Email support for authentication
+EMAIL_AUTH_USERNAME = ""
+EMAIL_AUTH_PASSWORD = ""
+
 #-------------------------------------------------------------------------------
 # Sigma Settings
 
diff --git a/timesketch/lib/utils.py b/timesketch/lib/utils.py
index 6ac665ae04..eb7d00453b 100644
--- a/timesketch/lib/utils.py
+++ b/timesketch/lib/utils.py
@@ -598,6 +598,10 @@ def send_email(subject, body, to_username, use_html=False):
     email_smtp_server = current_app.config.get("EMAIL_SMTP_SERVER")
     email_from_user = current_app.config.get("EMAIL_FROM_ADDRESS", "timesketch")
     email_user_whitelist = current_app.config.get("EMAIL_USER_WHITELIST", [])
+    email_login_username = current_app.config.get("EMAIL_AUTH_USERNAME")
+    email_login_password = current_app.config.get("EMAIL_AUTH_PASSWORD")
+    email_ssl = current_app.config.get("EMAIL_SSL")
+    email_tls = current_app.config.get("EMAIL_TLS")
 
     if not email_enabled:
         raise RuntimeError("Email notifications are not enabled, aborting.")
@@ -626,6 +630,28 @@ def send_email(subject, body, to_username, use_html=False):
     msg.add_header("Content-Type", email_content_type)
     msg.set_payload(body)
 
+    # EMAIL_SSL in timesketch.conf must be set to True
+    if email_ssl:
+        smtp = smtplib.SMTP_SSL(email_smtp_server)
+        if email_login_username and email_login_password:
+            smtp.login(email_login_username, email_login_password)
+        smtp.sendmail(msg["From"], [msg["To"]], msg.as_string())
+        smtp.quit()
+        return
+    # EMAIL_TLS in timesketch.conf must be set to True
+    if email_tls:
+        smtp = smtplib.SMTP(email_smtp_server)
+        smtp.ehlo()
+        smtp.starttls()
+        if email_login_username and email_login_password:
+            smtp.login(email_login_username, email_login_password)
+        smtp.sendmail(msg["From"], [msg["To"]], msg.as_string())
+        smtp.quit()
+        return
+
+    # default - no SSL/TLS configured
     smtp = smtplib.SMTP(email_smtp_server)
+    if email_login_username and email_login_password:
+        smtp.login(email_login_username, email_login_password)
     smtp.sendmail(msg["From"], [msg["To"]], msg.as_string())
     smtp.quit()

From e061a894f45701802fcfb57e80eb709b8f49157e Mon Sep 17 00:00:00 2001
From: Johan Berggren <jberggren@gmail.com>
Date: Wed, 25 Oct 2023 12:10:36 +0200
Subject: [PATCH 3/4] Instantiate side panel only once (#2949)

* Create side panel only once

* rounded buttons and bug fix

* Move progressbar

* fix layout

---------

Co-authored-by: Janosch <99879757+jkppr@users.noreply.github.com>
---
 .../src/components/LeftPanel/Search.vue       |   5 +-
 .../src/components/LeftPanel/Stories.vue      |   6 +-
 .../src/components/LeftPanel/Tags.vue         |   4 +-
 .../src/components/LeftPanel/ThreatIntel.vue  |   2 +-
 timesketch/frontend-ng/src/views/Sketch.vue   | 596 +++++++++---------
 5 files changed, 310 insertions(+), 303 deletions(-)

diff --git a/timesketch/frontend-ng/src/components/LeftPanel/Search.vue b/timesketch/frontend-ng/src/components/LeftPanel/Search.vue
index 4f97cbc1fc..375475a26d 100644
--- a/timesketch/frontend-ng/src/components/LeftPanel/Search.vue
+++ b/timesketch/frontend-ng/src/components/LeftPanel/Search.vue
@@ -16,7 +16,7 @@ limitations under the License.
 <template>
   <div>
     <router-link
-      :to="{ name: 'Explore', params: { sketchId: sketchId } }"
+      :to="{ name: 'Explore', params: { sketchId: sketch.id } }"
       custom
       v-slot="{ navigate }"
       class="pa-4"
@@ -40,6 +40,9 @@ limitations under the License.
 <script>
 export default {
   computed: {
+    sketch() {
+      return this.$store.state.sketch
+    },
     isExploreRoute() {
       return this.$route.name === 'Explore'
     },
diff --git a/timesketch/frontend-ng/src/components/LeftPanel/Stories.vue b/timesketch/frontend-ng/src/components/LeftPanel/Stories.vue
index 64fb7a9b5c..0b753c6af5 100644
--- a/timesketch/frontend-ng/src/components/LeftPanel/Stories.vue
+++ b/timesketch/frontend-ng/src/components/LeftPanel/Stories.vue
@@ -26,7 +26,7 @@ limitations under the License.
       <span> <v-icon left>mdi-book-open-outline</v-icon> Stories </span>
       <v-btn
         icon
-        v-if="expanded || !meta.stories.length"
+        v-if="expanded || !(meta.stories && meta.stories.length)"
         text
         class="float-right mt-n1 mr-n1"
         @click="createStory()"
@@ -35,8 +35,8 @@ limitations under the License.
         <v-icon>mdi-plus</v-icon>
       </v-btn>
 
-      <span v-if="!expanded" class="float-right" style="margin-right: 10px">
-        <small v-if="meta.stories.length"
+      <span v-if="!expanded && meta.stories && meta.stories.length" class="float-right" style="margin-right: 10px">
+        <small v-if="meta.stories"
           ><strong>{{ meta.stories.length }}</strong></small
         >
       </span>
diff --git a/timesketch/frontend-ng/src/components/LeftPanel/Tags.vue b/timesketch/frontend-ng/src/components/LeftPanel/Tags.vue
index 7a419c960b..1ee6418821 100644
--- a/timesketch/frontend-ng/src/components/LeftPanel/Tags.vue
+++ b/timesketch/frontend-ng/src/components/LeftPanel/Tags.vue
@@ -16,7 +16,7 @@ limitations under the License.
 <template>
   <div>
     <div
-      :style="tags && tags.length || labels && labels.length ? 'cursor: pointer' : ''"
+      :style="(tags && tags.length) || (labels && labels.length) ? 'cursor: pointer' : ''"
       class="pa-4"
       @click="expanded = !expanded"
       :class="$vuetify.theme.dark ? 'dark-hover' : 'light-hover'"
@@ -25,7 +25,7 @@ limitations under the License.
 
       <span class="float-right" style="margin-right: 10px">
         <small
-          ><strong>{{ tags.length + labels.length }}</strong></small
+          ><strong v-if="tags && labels">{{ tags.length + labels.length }}</strong></small
         >
       </span>
     </div>
diff --git a/timesketch/frontend-ng/src/components/LeftPanel/ThreatIntel.vue b/timesketch/frontend-ng/src/components/LeftPanel/ThreatIntel.vue
index 3afbe32716..b8d4fc7603 100644
--- a/timesketch/frontend-ng/src/components/LeftPanel/ThreatIntel.vue
+++ b/timesketch/frontend-ng/src/components/LeftPanel/ThreatIntel.vue
@@ -187,7 +187,7 @@ export default {
       return this.$store.state.meta
     },
     intelligenceAttribute() {
-      if (this.meta.attributes.intelligence === undefined) {
+      if (!this.meta.attributes || this.meta.attributes.intelligence === undefined) {
         return { ontology: 'intelligence', value: { data: [] }, name: 'intelligence' }
       }
       return this.meta.attributes.intelligence
diff --git a/timesketch/frontend-ng/src/views/Sketch.vue b/timesketch/frontend-ng/src/views/Sketch.vue
index 96c04d8cd9..b5fbe49b26 100644
--- a/timesketch/frontend-ng/src/views/Sketch.vue
+++ b/timesketch/frontend-ng/src/views/Sketch.vue
@@ -14,341 +14,345 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <template>
-  <div v-if="sketch" style="height: 30%">
+  <div>
     <!-- Progress indicator when loading sketch data -->
     <v-progress-linear v-if="loadingSketch" indeterminate color="primary"></v-progress-linear>
 
-    <!-- Empty state -->
-    <v-container v-if="!hasTimelines && !loadingSketch" fill-height fluid>
-      <v-row align="center" justify="center">
-        <v-sheet class="pa-4">
-          <center>
-            <div style="font-size: 2em" class="mb-3">It's empty around here</div>
-            <ts-upload-timeline-form btn-size="normal" btn-type="outlined"></ts-upload-timeline-form>
-          </center>
-        </v-sheet>
-      </v-row>
-    </v-container>
+    <div v-if="sketch.id" style="height: 30%">
+      <!-- Empty state -->
+      <v-container v-if="!hasTimelines && !loadingSketch" fill-height fluid>
+        <v-row align="center" justify="center">
+          <v-sheet class="pa-4 mt-15">
+            <center>
+              <div style="font-size: 2em" class="mb-3">It's empty around here</div>
+              <ts-upload-timeline-form btn-size="normal" btn-type="outlined"></ts-upload-timeline-form>
+            </center>
+          </v-sheet>
+        </v-row>
+      </v-container>
 
-    <!-- Archived state -->
-    <v-container v-if="isArchived && !loadingSketch" fill-height fluid>
-      <v-row align="center" justify="center">
-        <v-sheet class="pa-4">
-          <center>
-            <div style="font-size: 2em" class="mb-3">This sketch is archived</div>
-            <v-btn outlined color="primary" @click="unArchiveSketch()"> Bring it back </v-btn>
-          </center>
-        </v-sheet>
-      </v-row>
-    </v-container>
+      <!-- Archived state -->
+      <v-container v-if="isArchived && !loadingSketch" fill-height fluid>
+        <v-row align="center" justify="center">
+          <v-sheet class="pa-4">
+            <center>
+              <div style="font-size: 2em" class="mb-3">This sketch is archived</div>
+              <v-btn outlined color="primary" @click="unArchiveSketch()"> Bring it back </v-btn>
+            </center>
+          </v-sheet>
+        </v-row>
+      </v-container>
 
-    <!-- Rename sketch dialog -->
-    <v-dialog v-model="renameSketchDialog" width="600">
-      <v-card class="pa-4">
-        <ts-rename-sketch @close="renameSketchDialog = false"></ts-rename-sketch>
-      </v-card>
-    </v-dialog>
+      <!-- Rename sketch dialog -->
+      <v-dialog v-model="renameSketchDialog" width="600">
+        <v-card class="pa-4">
+          <ts-rename-sketch @close="renameSketchDialog = false"></ts-rename-sketch>
+        </v-card>
+      </v-dialog>
 
-    <!-- Top horizontal toolbar -->
-    <v-app-bar
-      v-if="!loadingSketch"
-      app
-      clipped-left
-      flat
-      :color="$vuetify.theme.dark ? '#121212' : 'white'"
-      :style="[
-        $vuetify.theme.dark
-          ? { 'border-bottom': '1px solid hsla(0,0%,100%,.12) !important' }
-          : { 'border-bottom': '1px solid rgba(0,0,0,.12) !important' },
-      ]"
-    >
-      <v-btn icon @click="toggleLeftPanel">
-        <v-icon>mdi-menu</v-icon>
-      </v-btn>
+      <!-- Top horizontal toolbar -->
+      <v-app-bar
+        v-if="!loadingSketch"
+        app
+        clipped-left
+        flat
+        :color="$vuetify.theme.dark ? '#121212' : 'white'"
+        :style="[
+          $vuetify.theme.dark
+            ? { 'border-bottom': '1px solid hsla(0,0%,100%,.12) !important' }
+            : { 'border-bottom': '1px solid rgba(0,0,0,.12) !important' },
+        ]"
+      >
+        <v-btn icon @click="toggleLeftPanel">
+          <v-icon>mdi-menu</v-icon>
+        </v-btn>
 
-      <v-avatar class="ml-n2 mt-1">
-        <router-link to="/">
-          <v-img src="/dist/timesketch-color.png" max-height="25" max-width="25" contain></v-img>
-        </router-link>
-      </v-avatar>
+        <v-avatar class="ml-n2 mt-1">
+          <router-link to="/">
+            <v-img src="/dist/timesketch-color.png" max-height="25" max-width="25" contain></v-img>
+          </router-link>
+        </v-avatar>
 
-      <v-hover v-slot="{ hover }">
-        <div class="d-flex flex-wrap">
-          <div
-            class="flex-1-0"
-            @dblclick="renameSketchDialog = true"
-            style="
-              font-size: 1.1em;
-              cursor: pointer;
-              white-space: nowrap;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              max-width: 900px;
-            "
-            :title="sketch.name"
-          >
-            {{ sketch.name }}
-          </div>
-          <div>
-            <v-icon small class="ml-1" v-if="hover" @click="renameSketchDialog = true">mdi-pencil</v-icon>
+        <v-hover v-slot="{ hover }">
+          <div class="d-flex flex-wrap">
+            <div
+              class="flex-1-0"
+              @dblclick="renameSketchDialog = true"
+              style="
+                font-size: 1.1em;
+                cursor: pointer;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                max-width: 900px;
+              "
+              :title="sketch.name"
+            >
+              {{ sketch.name }}
+            </div>
+            <div>
+              <v-icon small class="ml-1" v-if="hover" @click="renameSketchDialog = true">mdi-pencil</v-icon>
+            </div>
           </div>
-        </div>
-      </v-hover>
-      <v-spacer></v-spacer>
-      <v-btn small depressed v-on:click="switchUI"> Use the old UI </v-btn>
-
-      <!-- Sharing dialog -->
-      <v-dialog v-model="shareDialog" width="500">
-        <template v-slot:activator="{ on, attrs }">
-          <v-btn small depressed color="primary" class="ml-2" v-bind="attrs" v-on="on">
-            <v-icon small left>mdi-account-multiple-plus</v-icon>
-            Share
-          </v-btn>
-        </template>
-        <ts-share-card @close-dialog="shareDialog = false"></ts-share-card>
-      </v-dialog>
+        </v-hover>
+        <v-spacer></v-spacer>
+        <v-btn small rounded depressed v-on:click="switchUI"> Use the old UI </v-btn>
 
-      <v-avatar color="grey lighten-1" size="25" class="ml-3">
-        <span class="white--text">{{ currentUser | initialLetter }}</span>
-      </v-avatar>
-      <v-menu offset-y>
-        <template v-slot:activator="{ on, attrs }">
-          <v-avatar>
-            <v-btn small icon v-bind="attrs" v-on="on">
-              <v-icon>mdi-dots-vertical</v-icon>
+        <!-- Sharing dialog -->
+        <v-dialog v-model="shareDialog" width="500">
+          <template v-slot:activator="{ on, attrs }">
+            <v-btn small rounded depressed color="primary" class="ml-2" v-bind="attrs" v-on="on">
+              <v-icon small left>mdi-account-multiple-plus</v-icon>
+              Share
             </v-btn>
-          </v-avatar>
-        </template>
-        <v-card>
-          <v-list two-line>
-            <v-list-item v-if="sketch.user">
-              <v-list-item-content>
-                <v-list-item-title>
-                  <strong>Created:</strong> {{ sketch.created_at | shortDateTime }}
-                </v-list-item-title>
-                <v-list-item-subtitle>
-                  <small>{{ sketch.created_at | timeSince }} by {{ sketch.user.username }}</small>
-                </v-list-item-subtitle>
-              </v-list-item-content>
-            </v-list-item>
+          </template>
+          <ts-share-card @close-dialog="shareDialog = false"></ts-share-card>
+        </v-dialog>
 
-            <v-list-item>
-              <v-list-item-content>
-                <v-list-item-title>
-                  <strong>Access: </strong>
-                  <span v-if="meta.permissions && meta.permissions.public">Public</span>
-                  <span v-else>Restricted</span>
-                </v-list-item-title>
-                <v-list-item-subtitle>
-                  <small v-if="meta.permissions && meta.permissions.public">Visible to all users on this server</small>
-                  <small v-else>Only people with access can open</small>
-                </v-list-item-subtitle>
-              </v-list-item-content>
-            </v-list-item>
-          </v-list>
-
-          <v-list>
-            <v-list-item-group color="primary">
-              <v-list-item v-on:click="toggleTheme">
-                <v-list-item-icon>
-                  <v-icon>mdi-brightness-6</v-icon>
-                </v-list-item-icon>
+        <v-avatar color="grey lighten-1" size="25" class="ml-3">
+          <span class="white--text">{{ currentUser | initialLetter }}</span>
+        </v-avatar>
+        <v-menu offset-y>
+          <template v-slot:activator="{ on, attrs }">
+            <v-avatar>
+              <v-btn small icon v-bind="attrs" v-on="on">
+                <v-icon>mdi-dots-vertical</v-icon>
+              </v-btn>
+            </v-avatar>
+          </template>
+          <v-card>
+            <v-list two-line>
+              <v-list-item v-if="sketch.user">
                 <v-list-item-content>
-                  <v-list-item-title>Toggle theme</v-list-item-title>
+                  <v-list-item-title>
+                    <strong>Created:</strong> {{ sketch.created_at | shortDateTime }}
+                  </v-list-item-title>
+                  <v-list-item-subtitle>
+                    <small>{{ sketch.created_at | timeSince }} by {{ sketch.user.username }}</small>
+                  </v-list-item-subtitle>
                 </v-list-item-content>
               </v-list-item>
 
-              <v-list-item @click="renameSketchDialog = true">
-                <v-list-item-icon>
-                  <v-icon>mdi-pencil</v-icon>
-                </v-list-item-icon>
+              <v-list-item>
                 <v-list-item-content>
-                  <v-list-item-title>Rename sketch</v-list-item-title>
+                  <v-list-item-title>
+                    <strong>Access: </strong>
+                    <span v-if="meta.permissions && meta.permissions.public">Public</span>
+                    <span v-else>Restricted</span>
+                  </v-list-item-title>
+                  <v-list-item-subtitle>
+                    <small v-if="meta.permissions && meta.permissions.public"
+                      >Visible to all users on this server</small
+                    >
+                    <small v-else>Only people with access can open</small>
+                  </v-list-item-subtitle>
                 </v-list-item-content>
               </v-list-item>
+            </v-list>
 
-              <v-list-item @click="archiveSketch()">
-                <v-list-item-icon>
-                  <v-icon>mdi-archive</v-icon>
-                </v-list-item-icon>
-                <v-list-item-content>
-                  <v-list-item-title>Archive sketch</v-list-item-title>
-                </v-list-item-content>
-              </v-list-item>
+            <v-list>
+              <v-list-item-group color="primary">
+                <v-list-item v-on:click="toggleTheme">
+                  <v-list-item-icon>
+                    <v-icon>mdi-brightness-6</v-icon>
+                  </v-list-item-icon>
+                  <v-list-item-content>
+                    <v-list-item-title>Toggle theme</v-list-item-title>
+                  </v-list-item-content>
+                </v-list-item>
 
-              <v-list-item v-if="meta.permissions && meta.permissions.delete" @click="deleteSketch()">
-                <v-list-item-icon>
-                  <v-icon>mdi-trash-can-outline</v-icon>
-                </v-list-item-icon>
-                <v-list-item-content>
-                  <v-list-item-title>Delete sketch</v-list-item-title>
-                </v-list-item-content>
-              </v-list-item>
+                <v-list-item @click="renameSketchDialog = true">
+                  <v-list-item-icon>
+                    <v-icon>mdi-pencil</v-icon>
+                  </v-list-item-icon>
+                  <v-list-item-content>
+                    <v-list-item-title>Rename sketch</v-list-item-title>
+                  </v-list-item-content>
+                </v-list-item>
 
-              <a href="/logout/" style="text-decoration: none; color: inherit">
-                <v-list-item>
+                <v-list-item @click="archiveSketch()">
                   <v-list-item-icon>
-                    <v-icon>mdi-logout</v-icon>
+                    <v-icon>mdi-archive</v-icon>
                   </v-list-item-icon>
+                  <v-list-item-content>
+                    <v-list-item-title>Archive sketch</v-list-item-title>
+                  </v-list-item-content>
+                </v-list-item>
 
+                <v-list-item v-if="meta.permissions && meta.permissions.delete" @click="deleteSketch()">
+                  <v-list-item-icon>
+                    <v-icon>mdi-trash-can-outline</v-icon>
+                  </v-list-item-icon>
                   <v-list-item-content>
-                    <v-list-item-title>Logout</v-list-item-title>
+                    <v-list-item-title>Delete sketch</v-list-item-title>
                   </v-list-item-content>
                 </v-list-item>
-              </a>
-            </v-list-item-group>
-          </v-list>
-        </v-card>
-      </v-menu>
-    </v-app-bar>
 
-    <!-- Left panel -->
-    <v-navigation-drawer
-      v-if="showLeftPanel && hasTimelines && !isArchived"
-      app
-      clipped
-      permanent
-      :width="navigationDrawer.width"
-      hide-overlay
-      ref="drawer"
-    >
-      <!-- Dialog for adding a scenario -->
-      <v-dialog v-model="scenarioDialog" max-width="500px">
-        <v-card>
-          <div class="pa-3">
-            <h3>Investigative Scenarios</h3>
-            <v-select
-              v-model="selectedScenario"
-              :items="scenarioTemplates"
-              item-text="name"
-              return-object
-              label="Select a scenario"
-              outlined
-              class="mt-3"
-            ></v-select>
-            <div v-if="selectedScenario">
-              {{ selectedScenario.description }}
+                <a href="/logout/" style="text-decoration: none; color: inherit">
+                  <v-list-item>
+                    <v-list-item-icon>
+                      <v-icon>mdi-logout</v-icon>
+                    </v-list-item-icon>
+
+                    <v-list-item-content>
+                      <v-list-item-title>Logout</v-list-item-title>
+                    </v-list-item-content>
+                  </v-list-item>
+                </a>
+              </v-list-item-group>
+            </v-list>
+          </v-card>
+        </v-menu>
+      </v-app-bar>
+
+      <!-- Left panel -->
+      <v-navigation-drawer
+        v-show="showLeftPanel && hasTimelines && !isArchived"
+        app
+        clipped
+        permanent
+        :width="navigationDrawer.width"
+        hide-overlay
+        ref="drawer"
+      >
+        <!-- Dialog for adding a scenario -->
+        <v-dialog v-model="scenarioDialog" max-width="500px">
+          <v-card>
+            <div class="pa-3">
+              <h3>Investigative Scenarios</h3>
+              <v-select
+                v-model="selectedScenario"
+                :items="scenarioTemplates"
+                item-text="name"
+                return-object
+                label="Select a scenario"
+                outlined
+                class="mt-3"
+              ></v-select>
+              <div v-if="selectedScenario">
+                {{ selectedScenario.description }}
+              </div>
             </div>
-          </div>
-          <v-divider></v-divider>
-          <v-card-actions>
-            <v-spacer></v-spacer>
-            <v-btn @click="scenarioDialog = false" text> Cancel </v-btn>
-            <v-btn text color="primary" :disabled="!selectedScenario" @click="addScenario(selectedScenario.id)">
-              Add
-            </v-btn>
-          </v-card-actions>
-        </v-card>
-      </v-dialog>
+            <v-divider></v-divider>
+            <v-card-actions>
+              <v-spacer></v-spacer>
+              <v-btn @click="scenarioDialog = false" text> Cancel </v-btn>
+              <v-btn text color="primary" :disabled="!selectedScenario" @click="addScenario(selectedScenario.id)">
+                Add
+              </v-btn>
+            </v-card-actions>
+          </v-card>
+        </v-dialog>
 
-      <v-tabs v-model="leftPanelTab" grow>
-        <v-tab v-for="item in leftPanelTabItems" :key="item"> {{ item }} </v-tab>
-      </v-tabs>
-      <v-divider></v-divider>
-      <v-tabs-items v-model="leftPanelTab">
-        <v-tab-item :transition="false">
-          <ts-search></ts-search>
-          <ts-saved-searches v-if="meta.views"></ts-saved-searches>
-          <ts-data-types></ts-data-types>
-          <ts-tags></ts-tags>
-          <ts-graphs></ts-graphs>
-          <ts-stories></ts-stories>
-          <ts-intelligence></ts-intelligence>
-          <ts-search-templates></ts-search-templates>
-          <ts-sigma-rules></ts-sigma-rules>
-          <ts-analyzer-results></ts-analyzer-results>
-        </v-tab-item>
-        <v-tab-item :transition="false">
-          <ts-scenario v-for="scenario in activeScenarios" :key="scenario.id" :scenario="scenario"></ts-scenario>
-          <v-row class="mt-0 px-2" flat>
-            <v-col cols="6">
-              <v-card v-if="!Object.keys(scenarioTemplates).length" flat class="pa-4"
-                >No scenarios available yet. Contact your server admin to add scenarios to this server.</v-card
-              >
-              <v-btn v-else text color="primary" @click="scenarioDialog = true" style="cursor: pointer"
-                ><v-icon left>mdi-plus</v-icon> Add Scenario</v-btn
-              >
-            </v-col>
+        <v-tabs v-model="leftPanelTab" grow>
+          <v-tab v-for="item in leftPanelTabItems" :key="item"> {{ item }} </v-tab>
+        </v-tabs>
+        <v-divider></v-divider>
+        <v-tabs-items v-model="leftPanelTab">
+          <v-tab-item :transition="false">
+            <ts-search></ts-search>
+            <ts-saved-searches v-if="meta.views"></ts-saved-searches>
+            <ts-data-types></ts-data-types>
+            <ts-tags></ts-tags>
+            <ts-graphs></ts-graphs>
+            <ts-stories></ts-stories>
+            <ts-intelligence></ts-intelligence>
+            <ts-search-templates></ts-search-templates>
+            <ts-sigma-rules></ts-sigma-rules>
+            <ts-analyzer-results></ts-analyzer-results>
+          </v-tab-item>
+          <v-tab-item :transition="false">
+            <ts-scenario v-for="scenario in activeScenarios" :key="scenario.id" :scenario="scenario"></ts-scenario>
+            <v-row class="mt-0 px-2" flat>
+              <v-col cols="6">
+                <v-card v-if="!Object.keys(scenarioTemplates).length" flat class="pa-4"
+                  >No scenarios available yet. Contact your server admin to add scenarios to this server.</v-card
+                >
+                <v-btn v-else text color="primary" @click="scenarioDialog = true" style="cursor: pointer"
+                  ><v-icon left>mdi-plus</v-icon> Add Scenario</v-btn
+                >
+              </v-col>
+
+              <v-col cols="6">
+                <v-btn
+                  small
+                  text
+                  color="primary"
+                  v-if="hiddenScenarios.length"
+                  @click="showHidden = !showHidden"
+                  class="mt-1"
+                >
+                  <small
+                    ><span v-if="showHidden">Hide</span><span v-else>Show</span> hidden scenarios ({{
+                      hiddenScenarios.length
+                    }})</small
+                  >
+                </v-btn>
+              </v-col>
+            </v-row>
 
-            <v-col cols="6">
+            <div v-if="showHidden">
+              <ts-scenario v-for="scenario in hiddenScenarios" :key="scenario.id" :scenario="scenario"></ts-scenario>
+            </div>
+          </v-tab-item>
+        </v-tabs-items>
+      </v-navigation-drawer>
+
+      <!-- Main (canvas) view -->
+      <v-main class="notransition mt-5">
+        <router-view
+          v-if="sketch.status && hasTimelines && !isArchived"
+          @setTitle="(title) => (this.title = title)"
+        ></router-view>
+      </v-main>
+
+      <!-- Context search -->
+      <v-bottom-sheet
+        hide-overlay
+        persistent
+        no-click-animation
+        v-model="showTimelineView"
+        @click:outside="showTimelineView = false"
+        scrollable
+      >
+        <v-card>
+          <v-toolbar dense flat>
+            <strong>Context search</strong>
+            <v-btn-toggle v-model="contextTimeWindowSeconds" class="ml-10" rounded>
               <v-btn
+                v-for="duration in [1, 5, 10, 60, 300, 600, 1800, 3600]"
+                :key="duration"
+                :value="duration"
                 small
-                text
-                color="primary"
-                v-if="hiddenScenarios.length"
-                @click="showHidden = !showHidden"
-                class="mt-1"
+                outlined
+                @click="updateContextQuery(duration)"
               >
-                <small
-                  ><span v-if="showHidden">Hide</span><span v-else>Show</span> hidden scenarios ({{
-                    hiddenScenarios.length
-                  }})</small
-                >
+                {{ duration | formatSeconds }}
               </v-btn>
-            </v-col>
-          </v-row>
-
-          <div v-if="showHidden">
-            <ts-scenario v-for="scenario in hiddenScenarios" :key="scenario.id" :scenario="scenario"></ts-scenario>
-          </div>
-        </v-tab-item>
-      </v-tabs-items>
-    </v-navigation-drawer>
+            </v-btn-toggle>
+            <v-btn small text class="ml-5" @click="contextToSearch()">Replace search</v-btn>
 
-    <!-- Main (canvas) view -->
-    <v-main class="notransition mt-5">
-      <router-view
-        v-if="sketch.status && hasTimelines && !isArchived"
-        @setTitle="(title) => (this.title = title)"
-      ></router-view>
-    </v-main>
+            <v-spacer></v-spacer>
 
-    <!-- Context search -->
-    <v-bottom-sheet
-      hide-overlay
-      persistent
-      no-click-animation
-      v-model="showTimelineView"
-      @click:outside="showTimelineView = false"
-      scrollable
-    >
-      <v-card>
-        <v-toolbar dense flat>
-          <strong>Context search</strong>
-          <v-btn-toggle v-model="contextTimeWindowSeconds" class="ml-10" rounded>
-            <v-btn
-              v-for="duration in [1, 5, 10, 60, 300, 600, 1800, 3600]"
-              :key="duration"
-              :value="duration"
-              small
-              outlined
-              @click="updateContextQuery(duration)"
-            >
-              {{ duration | formatSeconds }}
+            <v-btn icon :disabled="timelineViewHeight > 40" @click="increaseTimelineViewHeight()">
+              <v-icon>mdi-chevron-up</v-icon>
             </v-btn>
-          </v-btn-toggle>
-          <v-btn small text class="ml-5" @click="contextToSearch()">Replace search</v-btn>
-
-          <v-spacer></v-spacer>
-
-          <v-btn icon :disabled="timelineViewHeight > 40" @click="increaseTimelineViewHeight()">
-            <v-icon>mdi-chevron-up</v-icon>
-          </v-btn>
-          <v-btn icon :disabled="timelineViewHeight === 0" @click="decreaseTimelineViewHeight()">
-            <v-icon>mdi-chevron-down</v-icon>
-          </v-btn>
-          <v-btn icon @click="showTimelineView = false">
-            <v-icon>mdi-close</v-icon>
-          </v-btn>
-        </v-toolbar>
-        <v-divider></v-divider>
-        <v-expand-transition>
-          <v-card-text :style="{ height: timelineViewHeight + 'vh' }" v-show="!minimizeTimelineView">
-            <ts-event-list :query-request="queryRequest" :highlight-event="currentContextEvent"></ts-event-list>
-          </v-card-text>
-        </v-expand-transition>
-      </v-card>
-    </v-bottom-sheet>
+            <v-btn icon :disabled="timelineViewHeight === 0" @click="decreaseTimelineViewHeight()">
+              <v-icon>mdi-chevron-down</v-icon>
+            </v-btn>
+            <v-btn icon @click="showTimelineView = false">
+              <v-icon>mdi-close</v-icon>
+            </v-btn>
+          </v-toolbar>
+          <v-divider></v-divider>
+          <v-expand-transition>
+            <v-card-text :style="{ height: timelineViewHeight + 'vh' }" v-show="!minimizeTimelineView">
+              <ts-event-list :query-request="queryRequest" :highlight-event="currentContextEvent"></ts-event-list>
+            </v-card-text>
+          </v-expand-transition>
+        </v-card>
+      </v-bottom-sheet>
+    </div>
   </div>
 </template>
 

From 30da8aa54e8e662a5a56b93a6534e4bba4aa08a2 Mon Sep 17 00:00:00 2001
From: bwhelan212 <123424127+bwhelan212@users.noreply.github.com>
Date: Wed, 25 Oct 2023 03:28:40 -0700
Subject: [PATCH 4/4] Unit test to ensure invalid timestamp conversions do not
 occur (#2954)

* Add new csv test file

* Change the message values in validate_date_events_timestamp_manipulation.csv

* Add test to make sure timestamp is converted correctly

* added entries for more verification

* Changed name of test_timestamp_conversion to current and fixed comparison between read entries and expectedoutputs

* fixed fields for test_timestamp_is_ISOformat and csv. changed csv name to validate_timestamp_conversion.csv

* format

---------

Co-authored-by: Han K Ngo <100813911+hankngo@users.noreply.github.com>
Co-authored-by: Isaac-G5900 <144189484+Isaac-G5900@users.noreply.github.com>
Co-authored-by: Johan Berggren <jberggren@gmail.com>
---
 .../validate_timestamp_conversion.csv         |  4 +++
 timesketch/lib/utils_test.py                  | 36 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 test_tools/test_events/validate_timestamp_conversion.csv

diff --git a/test_tools/test_events/validate_timestamp_conversion.csv b/test_tools/test_events/validate_timestamp_conversion.csv
new file mode 100644
index 0000000000..845aa9ec6f
--- /dev/null
+++ b/test_tools/test_events/validate_timestamp_conversion.csv
@@ -0,0 +1,4 @@
+"message","timestamp","datetime","timestamp_desc","data_type"
+"Checking timestamp conversion","1331698658000000","2012-03-14T04:17:38+00:00","Time Logged","This event has timestamp"
+"Checking timestamp conversion","1658689261000000","2022-07-24T19:01:01+0000","Time Logged","This event has timestamp"
+"Make sure message is same","1437789661000000","2015-07-25 02:01:01+00:00","Logging","This data_type should stay the same"
diff --git a/timesketch/lib/utils_test.py b/timesketch/lib/utils_test.py
index 871f420486..8e7ca0e219 100644
--- a/timesketch/lib/utils_test.py
+++ b/timesketch/lib/utils_test.py
@@ -180,6 +180,7 @@ def test_missing_timestamp_csv_file(self):
         """Test for parsing datetime values in CSV file"""
 
         # Test that a timestamp is generated if missing.
+
         expected_output = {
             "message": "No timestamp",
             "datetime": "2022-07-24T19:01:01+00:00",
@@ -196,6 +197,41 @@ def test_missing_timestamp_csv_file(self):
             expected_output,
         )
 
+    def test_timestamp_is_ISOformat(self):
+        """Test that timestamp values in CSV file are not altered"""
+
+        # Make sure timestamp is processed correctly, and the format is not altered
+        expected_outputs = [
+            {
+                "message": "Checking timestamp conversion",
+                "timestamp": 1331698658000000,
+                "datetime": "2012-03-14T04:17:38+00:00",
+                "timestamp_desc": "Time Logged",
+                "data_type": "This event has timestamp",
+            },
+            {
+                "message": "Checking timestamp conversion",
+                "timestamp": 1658689261000000,
+                "datetime": "2022-07-24T19:01:01+00:00",
+                "timestamp_desc": "Time Logged",
+                "data_type": "This event has timestamp",
+            },
+            {
+                "message": "Make sure message is same",
+                "timestamp": 1437789661000000,
+                "datetime": "2015-07-25T02:01:01+00:00",
+                "timestamp_desc": "Logging",
+                "data_type": "This data_type should stay the same",
+            },
+        ]
+        results = iter(
+            read_and_validate_csv(
+                "test_tools/test_events/validate_timestamp_conversion.csv"
+            )
+        )
+        for output in expected_outputs:
+            self.assertDictEqual(next(results), output)
+
     def test_invalid_JSONL_file(self):
         """Test for JSONL with missing keys in the dictionary wrt headers mapping"""
         linedict = {"DT": "2011-11-11", "MSG": "this is a test"}