assemblyline-core 4.5.1.dev184__tar.gz → 4.5.1.dev187__tar.gz

{assemblyline-core-4.5.1.dev184 → assemblyline-core-4.5.1.dev187}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline-core
-Version: 4.5.1.dev184
+Version: 4.5.1.dev187
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline-core-4.5.1.dev187/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.5.1.dev187

{assemblyline-core-4.5.1.dev184 → assemblyline-core-4.5.1.dev187}/assemblyline_core/dispatching/client.py

@@ -254,7 +254,8 @@ class DispatchClient:
 
     @elasticapm.capture_span(span_type='dispatch_client')
     def service_finished(self, sid: str, result_key: str, result: Result,
-                         temporary_data: Optional[dict[str, Any]] = None):
+                         temporary_data: Optional[dict[str, Any]] = None,
+                         version="create"):
         """Notifies the dispatcher of service completion, and possible new files to dispatch."""
         # Make sure the dispatcher knows we were working on this task
         task_key = ServiceTask.make_key(sid=sid, service_name=result.response.service_name, sha=result.sha256)
@@ -272,28 +273,22 @@ class DispatchClient:
             self.ds.emptyresult.save(result_key, {"expiry_ts": result.expiry_ts})
         else:
             while True:
-                old, version = self.ds.result.get_if_exists(result_key, version=True)
-                if old:
-                    if old.expiry_ts and result.expiry_ts:
-                        result.expiry_ts = max(result.expiry_ts, old.expiry_ts)
-                    else:
-                        result.expiry_ts = None
                 try:
-                    if self.ds.result.exists(result_key):
-                        # A result already exists for this key
-                        # Regenerate entire result key based on result and modified task (ignore caching)
-                        task.ignore_cache = True
-                        result_key = Result.help_build_key(sha256=task.fileinfo.sha256,
-                                                           service_name=result.response.service_name,
-                                                           service_version=result.response.service_version,
-                                                           service_tool_version=result.response.service_tool_version,
-                                                           is_empty=False,
-                                                           task=task)
-                        version = "create"
                     self.ds.result.save(result_key, result, version=version)
                     break
                 except VersionConflictException as vce:
                     self.log.info(f"Retrying to save results due to version conflict: {str(vce)}")
+                    # A result already exists for this key
+                    # Regenerate entire result key based on result and modified task (ignore caching)
+                    version = "create"
+                    result.created = now_as_iso()
+                    task.ignore_cache = True
+                    result_key = Result.help_build_key(sha256=task.fileinfo.sha256,
+                                                       service_name=result.response.service_name,
+                                                       service_version=result.response.service_version,
+                                                       service_tool_version=result.response.service_tool_version,
+                                                       is_empty=False,
+                                                       task=task)
 
         # Send the result key to any watching systems
         msg = {'status': 'OK', 'cache_key': result_key}

{assemblyline-core-4.5.1.dev184 → assemblyline-core-4.5.1.dev187}/assemblyline_core/tasking_client.py

@@ -24,6 +24,7 @@ from assemblyline.remote.datatypes.events import EventSender, EventWatcher
 from assemblyline.remote.datatypes.hash import ExpiringHash
 from assemblyline_core.dispatching.client import DispatchClient
 
+
 class TaskingClientException(Exception):
     pass
 
@@ -252,7 +253,7 @@ class TaskingClient:
         # If we are allowed, try to see if the result has been cached
         if not task.ignore_cache and not service_data.disable_cache:
             # Checking for previous results for this key
-            result = self.datastore.result.get_if_exists(result_key)
+            result, version = self.datastore.result.get_if_exists(result_key, version=True)
             if result:
                 metric_factory.increment('cache_hit')
                 if result.result.score:
@@ -262,8 +263,8 @@ class TaskingClient:
 
                 result.archive_ts = None
 
-                if task.ttl:
-                    result.expiry_ts = now_as_iso(task.ttl * 24 * 60 * 60)
+                if task.ttl and result.expiry_ts:
+                    result.expiry_ts = max(result.expiry_ts, now_as_iso(task.ttl * 24 * 60 * 60))
 
                 # Create a list of files to freshen
                 freshen_hashes = [task.fileinfo.sha256]
@@ -286,7 +287,7 @@ class TaskingClient:
                 for sha256 in freshen_hashes:
                     self.datastore.save_or_freshen_file(sha256, {}, result.expiry_ts, result.classification)
 
-                self.dispatch_client.service_finished(task.sid, result_key, result)
+                self.dispatch_client.service_finished(task.sid, result_key, result, version=version)
                 cache_found = True
 
             if not cache_found:

{assemblyline-core-4.5.1.dev184 → assemblyline-core-4.5.1.dev187}/assemblyline_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline-core
-Version: 4.5.1.dev184
+Version: 4.5.1.dev187
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline-core-4.5.1.dev184/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.5.1.dev184