assemblyline-core 4.7.3.dev10__tar.gz → 4.7.3.dev11__tar.gz

{assemblyline_core-4.7.3.dev10 → assemblyline_core-4.7.3.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.7.3.dev10
+Version: 4.7.3.dev11
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team
@@ -11,10 +11,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown

assemblyline_core-4.7.3.dev11/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.7.3.dev11

{assemblyline_core-4.7.3.dev10 → assemblyline_core-4.7.3.dev11}/assemblyline_core/workflow/run_workflow.py

@@ -1,17 +1,17 @@
 #!/usr/bin/env python
 
-import elasticapm
 import time
 
-from assemblyline_core.server_base import ServerBase
+import elasticapm
 from assemblyline.common import forge
 from assemblyline.common.isotime import now_as_iso
 from assemblyline.common.str_utils import safe_str
-
 from assemblyline.datastore.exceptions import SearchException
 from assemblyline.odm.models.alert import Event
 from assemblyline.odm.models.workflow import Workflow
 
+from assemblyline_core.server_base import ServerBase
+
 
 class WorkflowManager(ServerBase):
     def __init__(self):
@@ -19,7 +19,13 @@ class WorkflowManager(ServerBase):
 
         self.config = forge.get_config()
         self.datastore = forge.get_datastore(self.config)
-        self.start_ts = f"{self.datastore.ds.now}/{self.datastore.ds.day}-1{self.datastore.ds.day}"
+
+        # Get the earliest alert that has yet to have been triaged (or default to the last day)
+        alert = (self.datastore.alert.search("status:TRIAGE", sort='reporting_ts asc', rows=1,
+                                             fl='reporting_ts', as_obj=False)['items'] \
+                                                or \
+                                            [{'reporting_ts': 'now-1d/d'}])[0]
+        self.start_ts = alert['reporting_ts']
 
         if self.config.core.metrics.apm_server.server_url is not None:
             self.log.info(f"Exporting application metrics to: {self.config.core.metrics.apm_server.server_url}")

{assemblyline_core-4.7.3.dev10 → assemblyline_core-4.7.3.dev11}/assemblyline_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.7.3.dev10
+Version: 4.7.3.dev11
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team
@@ -11,10 +11,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown

{assemblyline_core-4.7.3.dev10 → assemblyline_core-4.7.3.dev11}/setup.py

@@ -1,7 +1,7 @@
 
 import os
 
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 # Try to load the version from a datafile in the package
 package_version = "4.0.0.dev0"
@@ -30,10 +30,6 @@ setup(
         'Intended Audience :: Developers',
         'Topic :: Software Development :: Libraries',
         'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
     ],

{assemblyline_core-4.7.3.dev10 → assemblyline_core-4.7.3.dev11}/test/test_workflow.py

@@ -1,11 +1,11 @@
-import pytest
 import random
-from assemblyline_core.workflow.run_workflow import WorkflowManager
 
-from assemblyline.common.isotime import now_as_iso
+import pytest
+from assemblyline.common.isotime import epoch_to_iso
 from assemblyline.odm.models.workflow import Workflow
 from assemblyline.odm.random_data import create_alerts, wipe_alerts, wipe_workflows
 from assemblyline.odm.randomizer import random_minimal_obj
+from assemblyline_core.workflow.run_workflow import WorkflowManager
 
 
 @pytest.fixture(scope="module")
@@ -13,7 +13,7 @@ def manager(datastore_connection):
     try:
         create_alerts(datastore_connection)
         wipe_workflows(datastore_connection)
-        datastore_connection.alert.update_by_query("*", [(datastore_connection.alert.UPDATE_SET, 'reporting_ts', now_as_iso())])
+        datastore_connection.alert.update_by_query("*", [(datastore_connection.alert.UPDATE_SET, 'reporting_ts', epoch_to_iso(0))])
         datastore_connection.alert.commit()
         yield WorkflowManager()
     finally:
@@ -23,12 +23,12 @@ def test_workflow(manager, datastore_connection):
     # Create workflow that targets alerts based on YARA rule association
     workflow = random_minimal_obj(Workflow)
 
-    yara_rule = random.choice(list(datastore_connection.alert.facet("al.yara").keys()))   
+    yara_rule = random.choice(list(datastore_connection.alert.facet("al.yara").keys()))
     workflow.query = f'al.yara:"{yara_rule}"'
     workflow.workflow_id = "AL_TEST"
     workflow.labels = ["AL_TEST"]
     workflow.priority = "LOW"
-    workflow.status = "MALICIOUS"    
+    workflow.status = "MALICIOUS"
     datastore_connection.workflow.save(workflow.workflow_id, workflow)
     datastore_connection.workflow.commit()
 
@@ -37,7 +37,7 @@ def test_workflow(manager, datastore_connection):
     manager.get_last_reporting_ts = lambda x: "now/d+1d"
     manager.try_run(run_once=True)
     datastore_connection.alert.commit()
-    
+
     # Assert that custom labels were applied to alerts
     assert datastore_connection.alert.search("label:AL_TEST", track_total_hits=True)['total']
 

assemblyline_core-4.7.3.dev10/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.7.3.dev10