[client] Force file read and rabbitmq send to use utf-8 charset

OpenCTI-Platform · Jul 5, 2023 · 9b984ec · 9b984ec
1 parent 0c0d051
commit 9b984ec
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/pycti/api/opencti_api_client.py b/pycti/api/opencti_api_client.py
@@ -629,7 +629,7 @@ def upload_file(self, **kwargs):
                 }
              """
             if data is None:
-                data = open(file_name, "rb")
+                data = open(file_name, "rb", encoding="utf-8")
                 if file_name.endswith(".json"):
                     mime_type = "application/json"
                 else:
@@ -664,7 +664,7 @@ def upload_pending_file(self, **kwargs):
                     }
                  """
             if data is None:
-                data = open(file_name, "rb")
+                data = open(file_name, "rb", encoding="utf-8")
                 if file_name.endswith(".json"):
                     mime_type = "application/json"
                 else:

diff --git a/pycti/connector/opencti_connector_helper.py b/pycti/connector/opencti_connector_helper.py
@@ -1057,7 +1057,7 @@ def _send_bundle(self, channel, bundle, **kwargs) -> None:
                 routing_key=self.connector_config["push_routing"],
                 body=json.dumps(message),
                 properties=pika.BasicProperties(
-                    delivery_mode=2,  # make message persistent
+                    delivery_mode=2, content_encoding="utf-8"  # make message persistent
                 ),
             )
         except (UnroutableError, NackError) as e:

diff --git a/pycti/entities/opencti_external_reference.py b/pycti/entities/opencti_external_reference.py
@@ -235,7 +235,7 @@ def add_file(self, **kwargs):
                 }
              """
             if data is None:
-                data = open(file_name, "rb")
+                data = open(file_name, "rb", encoding="utf-8")
                 if file_name.endswith(".json"):
                     mime_type = "application/json"
                 else:

diff --git a/pycti/entities/opencti_stix_cyber_observable.py b/pycti/entities/opencti_stix_cyber_observable.py
@@ -488,7 +488,7 @@ def add_file(self, **kwargs):
                     }
                  """
             if data is None:
-                data = open(file_name, "rb")
+                data = open(file_name, "rb", encoding="utf-8")
                 if file_name.endswith(".json"):
                     mime_type = "application/json"
                 else:
@@ -1300,7 +1300,7 @@ def upload_artifact(self, **kwargs):
                 }
             """
             if data is None:
-                data = open(file_name, "rb")
+                data = open(file_name, "rb", encoding="utf-8")
                 if file_name.endswith(".json"):
                     mime_type = "application/json"
                 else:

diff --git a/pycti/entities/opencti_stix_domain_object.py b/pycti/entities/opencti_stix_domain_object.py
@@ -815,7 +815,7 @@ def add_file(self, **kwargs):
                 }
              """
             if data is None:
-                data = open(file_name, "rb")
+                data = open(file_name, "rb", encoding="utf-8")
                 if file_name.endswith(".json"):
                     mime_type = "application/json"
                 else:

diff --git a/pycti/utils/opencti_stix2.py b/pycti/utils/opencti_stix2.py
@@ -182,7 +182,7 @@ def import_bundle_from_file(
         if not os.path.isfile(file_path):
             API_LOGGER.error("The bundle file does not exists")
             return None
-        with open(os.path.join(file_path)) as file:
+        with open(os.path.join(file_path), encoding="utf-8") as file:
             data = json.load(file)
         return self.import_bundle(data, update, types)