[client] Fix some stream catching issues

Author: Samuel Hassine

pycti/connector/opencti_connector_helper.py

@@ -225,8 +225,20 @@ def get_range(self, from_id):
     def run(self):
         if self.connector_last_event_id:
             from_event_id = self.connector_last_event_id
-            from_event_timestamp = 0
+            # If from event ID is "-", start from the beginning
+            if from_event_id == "-":
+                from_event_timestamp = 0
+            # If from event ID is a "pure" timestamp
+            elif "-" not in str(from_event_id):
+                from_event_timestamp = int(from_event_id)
+            elif "-" in str(from_event_id):
+                from_event_timestamp = int(str(from_event_id).split("-")[0])
+            else:
+                from_event_timestamp = 0
             last_event_timestamp = int(self.last_event_id.split("-")[0])
+            if from_event_timestamp > last_event_timestamp:
+                from_event_timestamp = last_event_timestamp - 1
+                from_event_id = str(from_event_timestamp) + "-0"
             while (
                 from_event_timestamp <= last_event_timestamp
                 and from_event_id != self.last_event_id

pycti/utils/opencti_stix2.py

@@ -997,7 +997,6 @@ def prepare_export(
         mode="simple",
         max_marking_definition_entity=None,
         no_custom_attributes=False,
-        description_as_id=False,
     ):
         if (
             self.check_max_marking_definition(
@@ -1029,19 +1028,12 @@ def prepare_export(
             del entity["createdBy"]
             del entity["createdById"]
 
-        if description_as_id:
-            if "description" in entity:
-                entity["description"] = entity["id"]
-            elif "x_opencti_description" in entity:
-                if no_custom_attributes:
-                    entity["description"] = entity["id"]
-                else:
-                    entity["x_opencti_description"] = entity["id"]
-            else:
-                entity["description"] = entity["id"]
-
         entity_copy = entity.copy()
         if no_custom_attributes:
+            if "observables" in entity:
+                del entity["observables"]
+            if "observablesIds" in entity:
+                del entity["observablesIds"]
             if "external_references" in entity:
                 del entity["external_references"]
             for key in entity_copy.keys():
@@ -1334,7 +1326,6 @@ def export_entity(
         mode="simple",
         max_marking_definition=None,
         no_custom_attributes=False,
-        description_as_id=False,
     ):
         max_marking_definition_entity = (
             self.opencti.marking_definition.read(id=max_marking_definition)
@@ -1384,7 +1375,6 @@ def export_entity(
             mode,
             max_marking_definition_entity,
             no_custom_attributes,
-            description_as_id,
         )
         if stix_objects is not None:
             bundle["objects"].extend(stix_objects)