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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline-core
-Version: 4.5.1.dev183
+Version: 4.5.1.dev184
 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

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

{assemblyline-core-4.5.1.dev183 → assemblyline-core-4.5.1.dev184}/assemblyline_core/ingester/ingester.py

@@ -36,6 +36,7 @@ from assemblyline.remote.datatypes.queues.priority import PriorityQueue
 from assemblyline.remote.datatypes.queues.comms import CommsQueue
 from assemblyline.remote.datatypes.queues.multi import MultiQueue
 from assemblyline.remote.datatypes.hash import Hash
+from assemblyline.remote.datatypes.user_quota_tracker import UserQuotaTracker
 from assemblyline import odm
 from assemblyline.odm.models.submission import SubmissionParams, Submission as DatabaseSubmission
 from assemblyline.odm.models.alert import EXTENDED_SCAN_VALUES
@@ -180,6 +181,9 @@ class Ingester(ThreadedCoreBase):
         # Utility object to handle post-processing actions
         self.postprocess_worker = ActionWorker(cache=True, config=self.config, datastore=self.datastore,
                                                redis_persist=self.redis_persist)
+        # Async Submission quota tracker
+        self.async_submission_tracker = UserQuotaTracker('async_submissions', timeout=24 * 60 * 60,  # 1 day timeout
+                                                         redis=self.redis_persist)
 
         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}")
@@ -640,7 +644,7 @@ class Ingester(ThreadedCoreBase):
                     'archived': False,
                     'archive_ts': None,
                     'classification': task.params.classification,
-                    'expiry_ts':now_as_iso(task.params.ttl * 24 * 60 * 60),
+                    'expiry_ts': now_as_iso(task.params.ttl * 24 * 60 * 60),
                     'from_archive': False,
                     'metadata': task.submission.metadata,
                     'params': task.params.as_primitives(),
@@ -863,6 +867,9 @@ class Ingester(ThreadedCoreBase):
         return True
 
     def _notify_drop(self, task: IngestTask):
+        if self.config.ui.enforce_quota:
+            self.async_submission_tracker.end(task.params.submitter)
+
         self.send_notification(task)
 
         c12n = task.params.classification
@@ -936,4 +943,7 @@ class Ingester(ThreadedCoreBase):
                 task.extended_scan = 'submitted'
                 task.params.psid = None
 
+        if self.config.ui.enforce_quota:
+            self.async_submission_tracker.end(task.params.submitter)
+
         self.send_notification(task)

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

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

assemblyline-core-4.5.1.dev183/assemblyline_core/VERSION

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