[client] handle draft read only errors (opencti #9300)

Author: JeremyCloarec

pycti/connector/opencti_connector_helper.py

@@ -247,6 +247,11 @@ def _process_message(self, channel, method, properties, body) -> None:
             {"tag": method.delivery_tag},
         )
 
+    def _set_draft_id(self, draft_id):
+        self.helper.draft_id = draft_id
+        self.helper.api.set_draft_id(draft_id)
+        self.helper.api_impersonate.set_draft_id(draft_id)
+
     def _data_handler(self, json_data) -> None:
         # Execute the callback
         try:
@@ -261,9 +266,7 @@ def _data_handler(self, json_data) -> None:
             self.helper.work_id = work_id
 
             self.helper.validation_mode = validation_mode
-            self.helper.draft_id = draft_id
-            self.helper.api.set_draft_id(draft_id)
-            self.helper.api_impersonate.set_draft_id(draft_id)
+            self._set_draft_id(draft_id)
 
             self.helper.playbook = None
             self.helper.enrichment_shared_organizations = None
@@ -360,12 +363,14 @@ def _data_handler(self, json_data) -> None:
             message = self.callback(event_data)
             if work_id:
                 self.helper.api.work.to_processed(work_id, message)
+            self._set_draft_id("")
 
         except Exception as e:  # pylint: disable=broad-except
             self.helper.metric.inc("error_count")
             self.helper.connector_logger.error(
                 "Error in message processing, reporting error to API"
             )
+            self._set_draft_id("")
             if work_id:
                 try:
                     self.helper.api.work.to_processed(work_id, str(e), True)

pycti/utils/opencti_stix2.py

@@ -40,6 +40,7 @@
 ERROR_TYPE_LOCK = "LOCK_ERROR"
 ERROR_TYPE_MISSING_REFERENCE = "MISSING_REFERENCE_ERROR"
 ERROR_TYPE_BAD_GATEWAY = "Bad Gateway"
+ERROR_TYPE_DRAFT_LOCK = "DRAFT_LOCKED"
 ERROR_TYPE_TIMEOUT = "Request timed out"
 
 # Extensions
@@ -2408,7 +2409,11 @@ def export_selected(
         return bundle
 
     def apply_patch_files(self, item):
-        field_patch = item["opencti_field_patch"]
+        field_patch = self.opencti.get_attribute_in_extension(
+            "opencti_field_patch", item
+        )
+        if field_patch is None:
+            field_patch = item["opencti_field_patch"]
         field_patch_files = next(
             (op for op in field_patch if op["key"] == "x_opencti_files"), None
         )
@@ -2671,6 +2676,19 @@ def import_item(
                 return self.import_item(
                     item, update, types, processing_count + 1, work_id
                 )
+            # A draft lock error occurs
+            elif ERROR_TYPE_DRAFT_LOCK in error_msg:
+                bundles_technical_error_counter.add(1)
+                if work_id is not None:
+                    self.opencti.work.api.set_draft_id("")
+                    self.opencti.work.report_expectation(
+                        work_id,
+                        {
+                            "error": error,
+                            "source": "Draft in read only",
+                        },
+                    )
+                return False
             # Platform does not know what to do and raises an error:
             # That also works for missing reference with too much execution
             else: