chg: [correlation graph] add date first/last seen separator + fix dis…

…play of ocr object tags
CIRCL · Apr 26, 2024 · 2b23d99 · 2b23d99
1 parent 5503d81
commit 2b23d99
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/bin/lib/objects/Ocrs.py b/bin/lib/objects/Ocrs.py
@@ -148,6 +148,7 @@ def get_meta(self, options=None, translation_target=''):
         if options is None:
             options = set()
         meta = self._get_meta(options=options)
+        meta['tags'] = self.get_tags()
         meta['content'] = self.get_content()
 
         # optional meta fields

diff --git a/var/www/blueprints/objects_ocr.py b/var/www/blueprints/objects_ocr.py
@@ -108,6 +108,7 @@ def object_ocr():
         meta = meta[0]
         languages = Language.get_translation_languages()
         return render_template("ShowOcr.html", meta=meta,
+                               bootstrap_label=bootstrap_label,
                                ail_tags=Tag.get_modal_add_tags(meta['id'], meta['type'], meta['subtype']),
                                translation_languages=languages, translation_target=target)
 

diff --git a/var/www/templates/correlation/show_correlation.html b/var/www/templates/correlation/show_correlation.html
@@ -733,9 +733,14 @@ <h4><i class="fas fa-tags"></i> Tags All Objects</h4>
 								desc = desc + "fa-times-circle\"></i>DOWN"
 							}
 							desc = desc + "</div></dd>"
-						} else if (key!="tags" && key!="id" && key!="img" && key!="icon" && key!="link" && key!="type") {
+						} else if (key!=="tags" && key!=="id" && key!=="img" && key!=="svg_icon" && key!=="icon" && key!=="link" && key!=="type") {
                             if (data[key]) {
-							    desc = desc + "<dt class=\"col-sm-3 px-0\">" + sanitize_text(key) + "</dt><dd class=\"col-sm-9 px-0\">" + sanitize_text(data[key]) + "</dd>"
+                                if ((key==="first_seen" || key==="last_seen") && data[key].length===8) {
+                                    let date = sanitize_text(data[key])
+                                    desc = desc + "<dt class=\"col-sm-3 px-0\">" + sanitize_text(key) + "</dt><dd class=\"col-sm-9 px-0\">" + date.slice(0, 4) + "-" + date.slice(4, 6) + "-" + date.slice(6, 8) + "</dd>"
+                                } else {
+							        desc = desc + "<dt class=\"col-sm-3 px-0\">" + sanitize_text(key) + "</dt><dd class=\"col-sm-9 px-0\">" + sanitize_text(data[key]) + "</dd>"
+                                }
                             }
 						}
 					});