From 3a019e91e6aab41ce2bc75ab498a59e3a6011fa3 Mon Sep 17 00:00:00 2001 From: Bocognano Sarah Date: Fri, 3 Oct 2025 19:21:21 +0200 Subject: [PATCH 1/2] [backend][POC] Remove labels from playbooks (#6669) --- pycti/utils/opencti_stix2.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pycti/utils/opencti_stix2.py b/pycti/utils/opencti_stix2.py index d3bd5b50b..a3f4ecc1a 100644 --- a/pycti/utils/opencti_stix2.py +++ b/pycti/utils/opencti_stix2.py @@ -2763,7 +2763,7 @@ def apply_opencti_operation(self, item, operation): if source_ids is None: source_ids = item["merge_source_ids"] self.opencti.stix.merge(id=target_id, object_ids=source_ids) - elif operation == "patch": + elif operation == "patch" or operation == "upsert_patch": self.apply_patch(item=item) elif operation == "pir_flag_element": id = item["id"] @@ -2840,10 +2840,12 @@ def import_item( opencti_operation = self.opencti.get_attribute_in_extension( "opencti_operation", item ) - if opencti_operation is not None: + if opencti_operation is None and "opencti_operation" in item: + opencti_operation=item["opencti_operation"] + if opencti_operation is not None and opencti_operation == "upsert_patch": + self.apply_opencti_operation(item, opencti_operation) + if opencti_operation is not None and opencti_operation != "upsert_patch": self.apply_opencti_operation(item, opencti_operation) - elif "opencti_operation" in item: - self.apply_opencti_operation(item, item["opencti_operation"]) elif item["type"] == "relationship": # Import relationship self.import_relationship(item, update, types) From 0d0289ab6a621ff5d6245d6a7650a482732f4057 Mon Sep 17 00:00:00 2001 From: Souad Hadjiat Date: Mon, 13 Oct 2025 15:12:23 +0200 Subject: [PATCH 2/2] [client] fix formatting --- pycti/utils/opencti_stix2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pycti/utils/opencti_stix2.py b/pycti/utils/opencti_stix2.py index a3f4ecc1a..0dbc20c4a 100644 --- a/pycti/utils/opencti_stix2.py +++ b/pycti/utils/opencti_stix2.py @@ -2841,7 +2841,7 @@ def import_item( "opencti_operation", item ) if opencti_operation is None and "opencti_operation" in item: - opencti_operation=item["opencti_operation"] + opencti_operation = item["opencti_operation"] if opencti_operation is not None and opencti_operation == "upsert_patch": self.apply_opencti_operation(item, opencti_operation) if opencti_operation is not None and opencti_operation != "upsert_patch":