[client-python] Report Full export (STIX/JSON) doesn't include relationships (#669)

Author: richard-julien

pycti/entities/opencti_stix_core_relationship.py

@@ -521,6 +521,7 @@ def read(self, **kwargs):
         start_time_stop = kwargs.get("startTimeStop", None)
         stop_time_start = kwargs.get("stopTimeStart", None)
         stop_time_stop = kwargs.get("stopTimeStop", None)
+        filters = kwargs.get("filters", None)
         custom_attributes = kwargs.get("customAttributes", None)
         if id is not None:
             self.opencti.app_logger.info("Reading stix_core_relationship", {"id": id})
@@ -543,6 +544,12 @@ def read(self, **kwargs):
             return self.opencti.process_multiple_fields(
                 result["data"]["stixCoreRelationship"]
             )
+        elif filters is not None:
+            result = self.list(filters=filters, customAttributes=custom_attributes)
+            if len(result) > 0:
+                return result[0]
+            else:
+                return None
         elif from_id is not None and to_id is not None:
             result = self.list(
                 fromOrToId=from_or_to_id,

pycti/entities/opencti_stix_nested_ref_relationship.py

@@ -178,6 +178,7 @@ def read(self, **kwargs):
         stop_time_start = kwargs.get("stopTimeStart", None)
         stop_time_stop = kwargs.get("stopTimeStop", None)
         custom_attributes = kwargs.get("customAttributes", None)
+        filters = kwargs.get("filters", None)
         if id is not None:
             self.opencti.app_logger.info(
                 "Reading stix_observable_relationship", {"id": id}
@@ -201,6 +202,12 @@ def read(self, **kwargs):
             return self.opencti.process_multiple_fields(
                 result["data"]["stixRefRelationship"]
             )
+        elif filters is not None:
+            result = self.list(filters=filters, customAttributes=custom_attributes)
+            if len(result) > 0:
+                return result[0]
+            else:
+                return None
         else:
             result = self.list(
                 fromOrToId=from_or_to_id,

pycti/entities/opencti_stix_object_or_stix_relationship.py

@@ -481,6 +481,7 @@ def __init__(self, opencti):
     def read(self, **kwargs):
         id = kwargs.get("id", None)
         custom_attributes = kwargs.get("customAttributes", None)
+        filters = kwargs.get("filters", None)
         if id is not None:
             self.opencti.app_logger.info(
                 "Reading StixObjectOrStixRelationship", {"id": id}
@@ -504,6 +505,12 @@ def read(self, **kwargs):
             return self.opencti.process_multiple_fields(
                 result["data"]["stixObjectOrStixRelationship"]
             )
+        elif filters is not None:
+            result = self.list(filters=filters)
+            if len(result) > 0:
+                return result[0]
+            else:
+                return None
         else:
             self.opencti.app_logger.error("Missing parameters: id")
             return None

pycti/entities/opencti_stix_sighting_relationship.py

@@ -431,6 +431,7 @@ def read(self, **kwargs):
         last_seen_start = kwargs.get("lastSeenStart", None)
         last_seen_stop = kwargs.get("lastSeenStop", None)
         custom_attributes = kwargs.get("customAttributes", None)
+        filters = kwargs.get("filters", None)
         if id is not None:
             self.opencti.app_logger.info("Reading stix_sighting", {"id": id})
             query = (
@@ -452,6 +453,12 @@ def read(self, **kwargs):
             return self.opencti.process_multiple_fields(
                 result["data"]["stixSightingRelationship"]
             )
+        elif filters is not None:
+            result = self.list(filters=filters)
+            if len(result) > 0:
+                return result[0]
+            else:
+                return None
         elif from_id is not None and to_id is not None:
             result = self.list(
                 fromOrToId=from_or_to_id,