From e97ada58731eef7e3cb987a598bf67226a029763 Mon Sep 17 00:00:00 2001 From: Jorge Candedo Justo Date: Wed, 11 Dec 2024 10:43:25 +0100 Subject: [PATCH 1/3] Remove harcoded first value when getting all indicators --- pycti/entities/opencti_indicator.py | 48 ++++++++++++++--------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/pycti/entities/opencti_indicator.py b/pycti/entities/opencti_indicator.py index 6d209099f..f5a43278b 100644 --- a/pycti/entities/opencti_indicator.py +++ b/pycti/entities/opencti_indicator.py @@ -63,8 +63,6 @@ def list(self, **kwargs): get_all = kwargs.get("getAll", False) with_pagination = kwargs.get("withPagination", False) with_files = kwargs.get("withFiles", False) - if get_all: - first = 100 self.opencti.app_logger.info( "Listing Indicators with filters", {"filters": json.dumps(filters)} @@ -366,13 +364,13 @@ def import_from_stix2(self, **kwargs): if stix_object is not None: # Search in extensions if "x_opencti_score" not in stix_object: - stix_object["x_opencti_score"] = ( - self.opencti.get_attribute_in_extension("score", stix_object) - ) + stix_object[ + "x_opencti_score" + ] = self.opencti.get_attribute_in_extension("score", stix_object) if "x_opencti_detection" not in stix_object: - stix_object["x_opencti_detection"] = ( - self.opencti.get_attribute_in_extension("detection", stix_object) - ) + stix_object[ + "x_opencti_detection" + ] = self.opencti.get_attribute_in_extension("detection", stix_object) if ( "x_opencti_main_observable_type" not in stix_object and self.opencti.get_attribute_in_extension( @@ -380,29 +378,29 @@ def import_from_stix2(self, **kwargs): ) is not None ): - stix_object["x_opencti_main_observable_type"] = ( - self.opencti.get_attribute_in_extension( - "main_observable_type", stix_object - ) + stix_object[ + "x_opencti_main_observable_type" + ] = self.opencti.get_attribute_in_extension( + "main_observable_type", stix_object ) if "x_opencti_create_observables" not in stix_object: - stix_object["x_opencti_create_observables"] = ( - self.opencti.get_attribute_in_extension( - "create_observables", stix_object - ) + stix_object[ + "x_opencti_create_observables" + ] = self.opencti.get_attribute_in_extension( + "create_observables", stix_object ) if "x_opencti_stix_ids" not in stix_object: - stix_object["x_opencti_stix_ids"] = ( - self.opencti.get_attribute_in_extension("stix_ids", stix_object) - ) + stix_object[ + "x_opencti_stix_ids" + ] = self.opencti.get_attribute_in_extension("stix_ids", stix_object) if "x_opencti_granted_refs" not in stix_object: - stix_object["x_opencti_granted_refs"] = ( - self.opencti.get_attribute_in_extension("granted_refs", stix_object) - ) + stix_object[ + "x_opencti_granted_refs" + ] = self.opencti.get_attribute_in_extension("granted_refs", stix_object) if "x_opencti_workflow_id" not in stix_object: - stix_object["x_opencti_workflow_id"] = ( - self.opencti.get_attribute_in_extension("workflow_id", stix_object) - ) + stix_object[ + "x_opencti_workflow_id" + ] = self.opencti.get_attribute_in_extension("workflow_id", stix_object) return self.create( stix_id=stix_object["id"], From 9e3d4068cd5cdf2be1131c51ba45952baea50e34 Mon Sep 17 00:00:00 2001 From: Jorge Candedo Justo Date: Wed, 11 Dec 2024 16:40:23 +0100 Subject: [PATCH 2/3] Fixed format --- pycti/entities/opencti_indicator.py | 46 ++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pycti/entities/opencti_indicator.py b/pycti/entities/opencti_indicator.py index f5a43278b..f67162035 100644 --- a/pycti/entities/opencti_indicator.py +++ b/pycti/entities/opencti_indicator.py @@ -364,13 +364,13 @@ def import_from_stix2(self, **kwargs): if stix_object is not None: # Search in extensions if "x_opencti_score" not in stix_object: - stix_object[ - "x_opencti_score" - ] = self.opencti.get_attribute_in_extension("score", stix_object) + stix_object["x_opencti_score"] = ( + self.opencti.get_attribute_in_extension("score", stix_object) + ) if "x_opencti_detection" not in stix_object: - stix_object[ - "x_opencti_detection" - ] = self.opencti.get_attribute_in_extension("detection", stix_object) + stix_object["x_opencti_detection"] = ( + self.opencti.get_attribute_in_extension("detection", stix_object) + ) if ( "x_opencti_main_observable_type" not in stix_object and self.opencti.get_attribute_in_extension( @@ -378,29 +378,29 @@ def import_from_stix2(self, **kwargs): ) is not None ): - stix_object[ - "x_opencti_main_observable_type" - ] = self.opencti.get_attribute_in_extension( - "main_observable_type", stix_object + stix_object["x_opencti_main_observable_type"] = ( + self.opencti.get_attribute_in_extension( + "main_observable_type", stix_object + ) ) if "x_opencti_create_observables" not in stix_object: - stix_object[ - "x_opencti_create_observables" - ] = self.opencti.get_attribute_in_extension( - "create_observables", stix_object + stix_object["x_opencti_create_observables"] = ( + self.opencti.get_attribute_in_extension( + "create_observables", stix_object + ) ) if "x_opencti_stix_ids" not in stix_object: - stix_object[ - "x_opencti_stix_ids" - ] = self.opencti.get_attribute_in_extension("stix_ids", stix_object) + stix_object["x_opencti_stix_ids"] = ( + self.opencti.get_attribute_in_extension("stix_ids", stix_object) + ) if "x_opencti_granted_refs" not in stix_object: - stix_object[ - "x_opencti_granted_refs" - ] = self.opencti.get_attribute_in_extension("granted_refs", stix_object) + stix_object["x_opencti_granted_refs"] = ( + self.opencti.get_attribute_in_extension("granted_refs", stix_object) + ) if "x_opencti_workflow_id" not in stix_object: - stix_object[ - "x_opencti_workflow_id" - ] = self.opencti.get_attribute_in_extension("workflow_id", stix_object) + stix_object["x_opencti_workflow_id"] = ( + self.opencti.get_attribute_in_extension("workflow_id", stix_object) + ) return self.create( stix_id=stix_object["id"], From 629268bf56dd2ed6ff773670d5218ce4c5810972 Mon Sep 17 00:00:00 2001 From: Jorge Candedo Justo Date: Wed, 8 Jan 2025 17:21:36 +0100 Subject: [PATCH 3/3] Empty commit