Merge pull request #304 from CybercentreCanada/single-filescore-key

Single filescore key
CybercentreCanada · Jul 22, 2021 · 3361f52 · 3361f52
2 parents 1b40d29 + edff383
commit 3361f52
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/assemblyline/odm/messages/submission.py b/assemblyline/odm/messages/submission.py
@@ -20,6 +20,7 @@ class Submission(odm.Model):
     metadata: Dict[str, str] = odm.FlattenedObject(default={})           # Metadata submitted with the file
     notification: Notification = odm.Compound(Notification, default={})  # Notification queue parameters
     params: SubmissionParams = odm.Compound(SubmissionParams)            # Parameters of the submission
+    scan_key: str = odm.Optional(odm.Keyword())
 
 
 def from_datastore_submission(submission: DatabaseSubmission):
@@ -31,7 +32,8 @@ def from_datastore_submission(submission: DatabaseSubmission):
         'sid': submission.sid,
         'files': submission.files,
         'metadata': submission.metadata,
-        'params': submission.params
+        'params': submission.params,
+        'scan_key': submission.scan_key
     })
 
 

diff --git a/assemblyline/odm/models/submission.py b/assemblyline/odm/models/submission.py
@@ -124,6 +124,10 @@ class Submission(odm.Model):
     times = odm.Compound(Times, default={})                     # Timing bloc
     verdict = odm.Compound(Verdict, default={})                 # Verdict timing
 
+    # the filescore key, used in deduplication. This is a non-unique key, that is
+    # shared by submissions that may be processed as duplicates.
+    scan_key = odm.Optional(odm.Keyword(store=False, index=False))
+
     def is_submit(self):
         return self.state == 'submitted'