2.4.2 wip

Author: Davide Arcuri

.pre-commit-config.yaml

@@ -21,6 +21,6 @@ repos:
       - id: isort
 
   - repo: https://github.com/hadialqattan/pycln
-    rev: v2.4.0
+    rev: v2.6.0
     hooks:
       - id: pycln

CHANGELOG.md

@@ -1,4 +1,11 @@
 ## Changelog
+<details>
+  <summary><b>OROCHI 2.4.2 WIP</b></summary>
+
+  * Run management task on workers [[#272](https://github.com/LDO-CERT/orochi/issues/272)]
+  * Update libs and UI
+</details>
+
 <details>
   <summary><b>OROCHI 2.4.1</b></summary>
 

compose/local/dask/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.13.6-slim-bookworm as common-base
+FROM python:3.13.11-slim-bookworm as common-base
 
 # DISABLE TZDATA INTERACTION
 ENV DEBIAN_FRONTEND noninteractive
@@ -91,4 +91,3 @@ RUN apt-get update && apt-get install -y tini && rm -rf /var/lib/apt/lists/*
 COPY --from=go-builder /dwarf2json/dwarf2json /dwarf2json/dwarf2json
 
 ENTRYPOINT ["/usr/bin/tini", "-g", "--", "/usr/bin/prepare.sh"]
-

compose/local/django/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.13.6-slim-bookworm as common-base
+FROM python:3.13.11-slim-bookworm as common-base
 
 
 ENV DJANGO_SETTINGS_MODULE config.settings.local

config/settings/base.py

@@ -283,6 +283,18 @@
     },
 }
 
+# TASKS
+# -------------------------------------------------------------------------------
+TASKS = {
+    "default": {
+        "BACKEND": "orochi.backends.dask.DaskTaskBackend",
+        "QUEUES": [],  # Empty list = allow all queue names
+        "OPTIONS": {
+            "ADDRESS": env("DASK_SCHEDULER_URL"),
+        },
+    },
+}
+
 # LDAP
 # ------------------------------------------------------------------------------
 AUTH_LDAP_SERVER_URI = env("AUTH_LDAP_SERVER_URI")

orochi/api/api.py

@@ -1,4 +1,5 @@
 from ninja import NinjaAPI
+from ninja.security import django_auth
 
 from orochi.api.routers.admin import router as admin_router
 from orochi.api.routers.auth import router as auth_router
@@ -12,7 +13,7 @@
 from orochi.api.routers.users import router as users_router
 from orochi.api.routers.utils import router as utils_router
 
-api = NinjaAPI(csrf=True, title="Orochi API", urls_namespace="api")
+api = NinjaAPI(auth=django_auth, title="Orochi API", urls_namespace="api")
 api.add_router("/admin/", admin_router, tags=["Admin"])
 api.add_router("/auth/", auth_router, tags=["Auth"])
 api.add_router("/users/", users_router, tags=["Users"])

orochi/api/routers/admin.py

@@ -93,13 +93,9 @@ def update_plugins(request):
         Exception: If an error occurs during plugin synchronization.
     """
 
-    try:
-        management.call_command("plugins_sync", verbosity=0)
-        messages.add_message(request, messages.INFO, "Sync Plugin done")
-        return 200, {"message": "Sync Plugin done"}
-    except Exception as e:
-        messages.add_message(request, messages.ERROR, f"Sync Plugin failed: {e}")
-        return 400, {"errors": "Error syncing plugins"}
+    management.call_command("plugins_sync", verbosity=0)
+    messages.add_message(request, messages.INFO, "Sync Plugin started")
+    return 200, {"message": "Sync Plugin started"}
 
 
 @router.get(
@@ -123,10 +119,6 @@ def update_symbols(request):
         Exception: If an error occurs during symbol synchronization.
     """
 
-    try:
-        management.call_command("symbols_sync", verbosity=0)
-        messages.add_message(request, messages.INFO, "Sync Symbols done")
-        return 200, {"message": "Sync Symbols done"}
-    except Exception as e:
-        messages.add_message(request, messages.ERROR, f"Sync Symbols failed: {e}")
-        return 400, {"errors": "Error syncing symbols"}
+    management.call_command("symbols_sync", verbosity=0)
+    messages.add_message(request, messages.INFO, "Sync Symbols started")
+    return 200, {"message": "Sync Symbols started"}

orochi/backends/dask.py

@@ -0,0 +1,42 @@
+import logging
+from copy import deepcopy
+
+from dask.distributed import Client, fire_and_forget
+from django.conf import settings
+from django.tasks.backends.base import BaseTaskBackend
+from django.tasks.base import TaskResult, TaskResultStatus
+
+logger = logging.getLogger(__name__)
+
+
+class DaskTaskBackend(BaseTaskBackend):
+
+    def __init__(self, alias, **kwargs):
+        super().__init__(alias, **kwargs)
+        self._client = None
+
+    @property
+    def client(self):
+        if self._client is None or self._client.status in ("closed", "closing"):
+            self._client = Client(settings.DASK_SCHEDULER_URL)
+        return self._client
+
+    def enqueue(self, task, args, kwargs):
+        logger.info(f"Enqueuing task {task.name}")
+        future = self.client.submit(task.func, *args, pure=False, **kwargs)
+        fire_and_forget(future)
+        result = TaskResult(
+            task=task,
+            id=future.key,
+            status=TaskResultStatus.READY,
+            enqueued_at=None,
+            started_at=None,
+            last_attempted_at=None,
+            finished_at=None,
+            args=args,
+            kwargs=kwargs,
+            backend=self.alias,
+            errors=[],
+            worker_ids=[],
+        )
+        return deepcopy(result)

orochi/static/README.txt

@@ -1,26 +1,26 @@
 # Bootstrap [MAIN CSS]
 --> https://getbootstrap.com/
---> version 5.3.3
+--> version 5.3.8
 
 # Fontawesome [ICON]
 --> https://fontawesome.com/
---> version 6.6.0
+--> version 7.0.0
 
 # diff_view [COMPARE 2 PLUGIN RESULT]
 --> https://benjamine.github.io/jsondiffpatch/demo/index.html
 --> code taken directly from html example
 
 # jsonedit [VIEW JSON FILE, eg. HIVE]
 --> https://github.com/josdejong/jsoneditor/tree/master
---> version 10.1.0
+--> version 10.4.2
 
 # bootbox [INPUT & CONFIRM DIALOG]
 --> http://bootboxjs.com/
---> version 6.0.0
+--> version 6.0.4
 
 # wunderbaum [TREE VIEW FOR PSTREE]
 --> https://github.com/mar10/wunderbaum/
---> version 0.11.0
+--> version 0.13.0
 
 # Datatables [TABLE RENDERING]
 --> https://datatables.net/
@@ -33,11 +33,11 @@
 
 # Keyrune [MTG icons]
 --> https://github.com/andrewgioia/keyrune
---> version 3.14.0
+--> version 3.18.0
 
 # Marked [Changelog with MD]
 --> https://github.com/markedjs/marked
---> version 14.1.0
+--> version 17.0.1
 
 # Handlebars [Template rendering]
 --> https://handlebarsjs.com/