assemblyline-core 4.7.2.dev47__tar.gz → 4.7.2.2__tar.gz

{assemblyline_core-4.7.2.dev47 → assemblyline_core-4.7.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.7.2.dev47
+Version: 4.7.2.2
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.7.2.2/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.7.2.2

{assemblyline_core-4.7.2.dev47 → assemblyline_core-4.7.2.2}/assemblyline_core/dispatching/dispatcher.py

@@ -27,6 +27,7 @@ from assemblyline.common.forge import (
 )
 from assemblyline.common.isotime import now_as_iso
 from assemblyline.common.metrics import MetricsFactory
+from assemblyline.common.postprocess import ActionWorker
 from assemblyline.datastore.helper import AssemblylineDatastore
 from assemblyline.odm.messages.changes import Operation, ServiceChange
 from assemblyline.odm.messages.dispatcher_heartbeat import Metrics
@@ -233,6 +234,10 @@ class Dispatcher(ThreadedCoreBase):
         # already processed
         self.timeout_queue: Queue[DispatchAction] = Queue()
 
+        # Utility object to handle post-processing actions
+        self.postprocess_worker = ActionWorker(cache=False, config=self.config, datastore=self.datastore,
+                                               redis_persist=self.redis_persist)
+
         # Update bad sid list
         self.redis_bad_sids = Set(BAD_SID_HASH, host=self.redis_persist)
         self.bad_sids: set[str] = set(self.redis_bad_sids.members())
@@ -244,6 +249,7 @@ class Dispatcher(ThreadedCoreBase):
     def stop(self):
         super().stop()
         self.service_change_watcher.stop()
+        self.postprocess_worker.stop()
 
     def try_run(self):
         self.log.info(f'Using dispatcher id {self.instance_id}')

{assemblyline_core-4.7.2.dev47 → assemblyline_core-4.7.2.2}/assemblyline_core/ingester/ingester.py

@@ -25,6 +25,7 @@ from assemblyline.common.exceptions import get_stacktrace_info
 from assemblyline.common.importing import load_module_by_path
 from assemblyline.common.isotime import now, now_as_iso
 from assemblyline.common.metrics import MetricsFactory
+from assemblyline.common.postprocess import ActionWorker
 from assemblyline.common.str_utils import dotdump, safe_str
 from assemblyline.datastore.exceptions import DataStoreException
 from assemblyline.filestore import CorruptedFileStoreException, FileStoreException

{assemblyline_core-4.7.2.dev47 → assemblyline_core-4.7.2.2}/assemblyline_core/updater/run_updater.py

@@ -12,6 +12,7 @@ from typing import Any, Dict, List, Optional
 
 import docker
 from assemblyline.common import isotime
+from assemblyline.common.version import FRAMEWORK_VERSION, SYSTEM_VERSION
 from assemblyline.odm.messages.changes import Operation, ServiceChange
 from assemblyline.odm.models.config import Mount, Selector
 from assemblyline.odm.models.service import DockerConfig, Service
@@ -499,9 +500,9 @@ class ServiceUpdater(ThreadedCoreBase):
             # Install function for services
             def install_service(service_name: str, install_data: dict) -> str:
                 if self.config.services.preferred_update_channel == 'stable':
-                    tag = 'stable'
+                    tag = f'{FRAMEWORK_VERSION}.{SYSTEM_VERSION}.stable'
                 else:
-                    tag = 'latest'
+                    tag = f'{FRAMEWORK_VERSION}.{SYSTEM_VERSION}.latest'
                 try:
                     service = Service(
                         {'name': service_name,

{assemblyline_core-4.7.2.dev47 → assemblyline_core-4.7.2.2}/assemblyline_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.7.2.dev47
+Version: 4.7.2.2
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.7.2.dev47/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.7.2.dev47