Merge branch 'main' of github.com:MISP/misp-stix

chrisr3d · Jul 28, 2023 · 404bcfb · 404bcfb
2 parents d19257a + 48f7724
commit 404bcfb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/misp_stix_converter/stix2misp/external_stix2_to_misp.py b/misp_stix_converter/stix2misp/external_stix2_to_misp.py
@@ -28,7 +28,7 @@
     X509Certificate as X509Certificate_v20)
 from stix2.v20.sdo import (
     CourseOfAction as CourseOfAction_v20, Vulnerability as Vulnerability_v20)
-from stix2.v20.observables import (
+from stix2.v21.observables import (
     AutonomousSystem as AutonomousSystem_v21, Directory as Directory_v21,
     DomainName as DomainName_v21, EmailAddress as EmailAddress_v21,
     EmailMessage as EmailMessage_v21, File as File_v21,

diff --git a/misp_stix_converter/stix2misp/internal_stix2_to_misp.py b/misp_stix_converter/stix2misp/internal_stix2_to_misp.py
@@ -333,6 +333,8 @@ def _parse_malware(self, malware_ref: str):
     def _parse_note(self, note_ref: str):
         note = self._get_stix_object(note_ref)
         misp_object = self._create_misp_object('annotation', note)
+        self._sanitise_object_uuid(misp_object, note.id)
+        misp_object.from_dict(**self._parse_timeline(note))
         for feature, mapping in self._mapping.annotation_object_mapping().items():
             if hasattr(note, feature):
                 self._populate_object_attributes_with_data(