[client] Error when importing text files or PDFs (#643)

Author: richard-julien

examples/export_incident_stix2.py

@@ -23,7 +23,9 @@
 )
 
 # Create the bundle
-bundle = opencti_api_client.stix2.export_entity("Incident", incident["id"], "full")
+bundle = opencti_api_client.stix2.get_stix_bundle_or_object_from_entity_id(
+    entity_type="Incident", entity_id=incident["id"], mode="full"
+)
 json_bundle = json.dumps(bundle, indent=4)
 
 # Write the bundle

examples/export_intrusion_set_stix2.py

@@ -12,8 +12,10 @@
 opencti_api_client = OpenCTIApiClient(api_url, api_token)
 
 # Create the bundle
-bundle = opencti_api_client.stix2.export_entity(
-    "Intrusion-Set", "4ecc2f52-d10a-4e10-bb9b-1ab5df2b282e", "full"
+bundle = opencti_api_client.stix2.get_stix_bundle_or_object_from_entity_id(
+    entity_type="Intrusion-Set",
+    entity_id="4ecc2f52-d10a-4e10-bb9b-1ab5df2b282e",
+    mode="full",
 )
 json_bundle = json.dumps(bundle, indent=4)
 

examples/export_report_stix2.py

@@ -12,8 +12,10 @@
 opencti_api_client = OpenCTIApiClient(api_url, api_token)
 
 # Create the bundle
-bundle = opencti_api_client.stix2.export_entity(
-    "Report", "report--2dc2b918-a0a3-569e-a305-f784486003c2", "full"
+bundle = opencti_api_client.stix2.get_stix_bundle_or_object_from_entity_id(
+    entity_type="Report",
+    entity_id="report--2dc2b918-a0a3-569e-a305-f784486003c2",
+    mode="full",
 )
 json_bundle = json.dumps(bundle, indent=4)
 

pycti/connector/opencti_connector_helper.py

@@ -314,7 +314,9 @@ def _data_handler(self, json_data) -> None:
                     # If not playbook but enrichment, compute object on enrichment_entity
                     opencti_entity = event_data["enrichment_entity"]
                     stix_objects = self.helper.api.stix2.prepare_export(
-                        self.helper.api.stix2.generate_export(copy.copy(opencti_entity))
+                        entity=self.helper.api.stix2.generate_export(
+                            copy.copy(opencti_entity)
+                        )
                     )
                     stix_entity = [
                         e
@@ -1567,7 +1569,7 @@ def get_data_from_enrichment(self, data, standard_id, opencti_entity):
         if bundle is None:
             # Generate bundle
             stix_objects = self.api.stix2.prepare_export(
-                self.api.stix2.generate_export(copy.copy(opencti_entity))
+                entity=self.api.stix2.generate_export(copy.copy(opencti_entity))
             )
         else:
             stix_objects = bundle["objects"]

pycti/entities/opencti_intrusion_set.py

@@ -275,17 +275,15 @@ def list(self, **kwargs):
             }
         """
         )
-        result = self.opencti.query(
-            query,
-            {
-                "filters": filters,
-                "search": search,
-                "first": first,
-                "after": after,
-                "orderBy": order_by,
-                "orderMode": order_mode,
-            },
-        )
+        variables = {
+            "filters": filters,
+            "search": search,
+            "first": first,
+            "after": after,
+            "orderBy": order_by,
+            "orderMode": order_mode,
+        }
+        result = self.opencti.query(query, variables)
         if get_all:
             final_data = []
             data = self.opencti.process_multiple(result["data"]["intrusionSets"])

pycti/entities/opencti_stix_domain_object.py

@@ -1355,8 +1355,10 @@ def push_list_export(
         )
 
     def push_entity_export(
-        self, entity_id, file_name, data, file_markings, mime_type=None
+        self, entity_id, file_name, data, file_markings=None, mime_type=None
     ):
+        if file_markings is None:
+            file_markings = []
         query = """
             mutation StixDomainObjectEdit(
                 $id: ID!, $file: Upload!,

pycti/entities/opencti_stix_object_or_stix_relationship.py

@@ -513,6 +513,7 @@ def list(self, **kwargs):
         search = kwargs.get("search", None)
         first = kwargs.get("first", 100)
         after = kwargs.get("after", None)
+        get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("with_pagination", False)
         custom_attributes = kwargs.get("customAttributes", None)
 
@@ -542,16 +543,40 @@ def list(self, **kwargs):
                     }
                 """
         )
+        variables = {
+            "filters": filters,
+            "search": search,
+            "first": first,
+            "after": after,
+        }
         result = self.opencti.query(
             query,
-            {
-                "filters": filters,
-                "search": search,
-                "first": first,
-                "after": after,
-            },
+            variables,
         )
 
-        return self.opencti.process_multiple(
-            result["data"]["stixObjectOrStixRelationships"], with_pagination
-        )
+        if get_all:
+            final_data = []
+            data = self.opencti.process_multiple(
+                result["data"]["stixObjectOrStixRelationships"]
+            )
+            final_data = final_data + data
+            while result["data"]["stixObjectOrStixRelationships"]["pageInfo"][
+                "hasNextPage"
+            ]:
+                after = result["data"]["stixObjectOrStixRelationships"]["pageInfo"][
+                    "endCursor"
+                ]
+                self.opencti.app_logger.info(
+                    "Listing stixObjectOrStixRelationships", {"after": after}
+                )
+                after_variables = {**variables, **{"after": after}}
+                result = self.opencti.query(query, after_variables)
+                data = self.opencti.process_multiple(
+                    result["data"]["stixObjectOrStixRelationships"]
+                )
+                final_data = final_data + data
+            return final_data
+        else:
+            return self.opencti.process_multiple(
+                result["data"]["stixObjectOrStixRelationships"], with_pagination
+            )