[client] Add keep_original_id option

Author: richard-julien

pycti/utils/opencti_stix2.py

@@ -176,7 +176,11 @@ def pick_aliases(self, stix_object: Dict) -> Optional[List]:
         return None
 
     def import_bundle_from_file(
-        self, file_path: str, update: bool = False, types: List = None
+        self,
+        file_path: str,
+        update: bool = False,
+        types: List = None,
+        keep_original_id: bool = False,
     ) -> Optional[List]:
         """import a stix2 bundle from a file
 
@@ -186,6 +190,8 @@ def import_bundle_from_file(
         :type update: bool, optional
         :param types: list of stix2 types, defaults to None
         :type types: list, optional
+        :param keep_original_id: import need to keep original id
+        :type keep_original_id: bool, optional
         :return: list of imported stix2 objects
         :rtype: List
         """
@@ -194,7 +200,7 @@ def import_bundle_from_file(
             return None
         with open(os.path.join(file_path), encoding="utf-8") as file:
             data = json.load(file)
-        return self.import_bundle(data, update, types)
+        return self.import_bundle(data, update, types, None, keep_original_id)
 
     def import_bundle_from_json(
         self,
@@ -2670,6 +2676,7 @@ def import_bundle(
         update: bool = False,
         types: List = None,
         work_id: str = None,
+        keep_original_id: bool = False,
     ) -> List:
         # Check if the bundle is correctly formatted
         if "type" not in stix_bundle or stix_bundle["type"] != "bundle":
@@ -2684,7 +2691,7 @@ def import_bundle(
 
         # Bundle ids must be rewritten
         stix_bundle = self.prepare_bundle_ids(
-            bundle=stix_bundle, use_json=False, keep_original_id=False
+            bundle=stix_bundle, use_json=False, keep_original_id=keep_original_id
         )
 
         stix2_splitter = OpenCTIStix2Splitter()