timeliner wip + dask logging

LDO-CERT · Jan 19, 2024 · fcd59a1 · fcd59a1
1 parent 7267545
commit fcd59a1
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 ## Changelog
 
 <details open>
+  <summary><b>OROCHI 2.0.2 [WIP]</b></summary>
+
+  * Paginate analysis results in tree
+</details>
+
+<details>
   <summary><b>OROCHI 2.0.1 [2024/01/18]</b></summary>
 
   * Add tree visualization for other plugin

diff --git a/compose/local/dask/daskworkerinit.py b/compose/local/dask/daskworkerinit.py
@@ -1,8 +1,12 @@
+import logging
 import os
 import sys
 
 import django
 
+logger = logging.getLogger("distributed.utils_perf")
+logger.setLevel(logging.ERROR)
+
 os.environ["DATABASE_URL"] = "postgres://{}:{}@{}:{}/{}".format(
     os.environ["POSTGRES_USER"],
     os.environ["POSTGRES_PASSWORD"],

diff --git a/orochi/website/views.py b/orochi/website/views.py
@@ -618,18 +618,31 @@ def analysis(request):
                 elif res.result == RESULT_STATUS_SUCCESS:
                     try:
                         index = f"{res.dump.index}_{res.plugin.name.lower()}"
+
+                        # GET COLUMNS FROM ELASTIC
                         mappings = es_client.indices.get_mapping(index=index)
                         columns = [
                             x
                             for x in mappings[index]["mappings"]["properties"]
                             if x not in SYSTEM_COLUMNS
                         ]
+
+                        # IF PLUGIN HAS REPORT SHOW REPORT COLUMN
                         if (
                             res.plugin.vt_check
                             or res.plugin.regipy_check
                             or res.plugin.clamav_check
                         ):
                             columns += ["reports"]
+
+                        # TIMELINER HAS SOME CUSTOM RENDERED COLUMS
+                        if res.plugin.name.lower() == "timeliner.timeliner":
+                            columns += ["Date", "Type", "row_color"]
+                            columns = [
+                                x for x in columns if x not in COLOR_TIMELINER.keys()
+                            ]
+
+                        # DEFAULT COLUMN ADDED
                         columns += ["hashes", "color", "actions"]
                     except elasticsearch.NotFoundError:
                         continue

diff --git a/version.py b/version.py
@@ -1 +1 @@
-__version__ = "2.0.1"
+__version__ = "2.0.2"