Merge branch 'dfiq-history-context' of github.com:google/timesketch i…

…nto dfiq-history-context
google · Oct 25, 2023 · a13dc6d · a13dc6d
2 parents f575d06 + 2895787
commit a13dc6d
Show file tree

Hide file tree

Showing 10 changed files with 387 additions and 306 deletions.
diff --git 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/test_tools/test_events/validate_timestamp_conversion.csv 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/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>

diff --git 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
@@ -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
@@ -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
@@ -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