Applied auto-formatting

Author: bnazare

pycti/api/opencti_api_client.py

@@ -143,9 +143,15 @@ def __init__(
             raise ValueError("A TOKEN must be set")
 
         # Configure logger
-        self.logger_class = logger(log_level.upper(), json_logging, graylog_host, graylog_port, graylog_adapter,
-                                   log_shipping_level.upper() if log_shipping_level is not None else None,
-                                   log_shipping_env_var_prefix)
+        self.logger_class = logger(
+            log_level.upper(),
+            json_logging,
+            graylog_host,
+            graylog_port,
+            graylog_adapter,
+            log_shipping_level.upper() if log_shipping_level is not None else None,
+            log_shipping_env_var_prefix,
+        )
         self.app_logger = self.logger_class("api")
 
         # Define API

pycti/connector/opencti_connector_helper.py

@@ -885,13 +885,21 @@ def __init__(self, config: Dict, playbook_compatible=False) -> None:
             "CONNECTOR_GRAYLOG_PORT", ["connector", "graylog_port"], config, True, 12201
         )
         self.graylog_adapter = get_config_variable(
-            "CONNECTOR_GRAYLOG_ADAPTER", ["connector", "graylog_adapter"], config, default="udp"
+            "CONNECTOR_GRAYLOG_ADAPTER",
+            ["connector", "graylog_adapter"],
+            config,
+            default="udp",
         )
         self.log_shipping_level = get_config_variable(
-            "CONNECTOR_LOG_SHIPPING_LEVEL", ["connector", "log_shipping_level"], config, default="INFO"
+            "CONNECTOR_LOG_SHIPPING_LEVEL",
+            ["connector", "log_shipping_level"],
+            config,
+            default="INFO",
         ).upper()
         self.log_shipping_env_var_prefix = get_config_variable(
-            "CONNECTOR_LOG_SHIPPING_ENV_VAR_PREFIX", ["connector", "log_shipping_env_var_prefix"], config
+            "CONNECTOR_LOG_SHIPPING_ENV_VAR_PREFIX",
+            ["connector", "log_shipping_env_var_prefix"],
+            config,
         )
         self.connect_run_and_terminate = get_config_variable(
             "CONNECTOR_RUN_AND_TERMINATE",
@@ -1627,9 +1635,9 @@ def send_stix2_bundle(self, bundle: str, **kwargs) -> list:
                             )
                         )
                     else:
-                        octi_extensions["granted_refs"] = (
-                            self.enrichment_shared_organizations
-                        )
+                        octi_extensions[
+                            "granted_refs"
+                        ] = self.enrichment_shared_organizations
                 else:
                     if item.get("x_opencti_granted_refs") is not None:
                         item["x_opencti_granted_refs"] = list(
@@ -1639,9 +1647,9 @@ def send_stix2_bundle(self, bundle: str, **kwargs) -> list:
                             )
                         )
                     else:
-                        item["x_opencti_granted_refs"] = (
-                            self.enrichment_shared_organizations
-                        )
+                        item[
+                            "x_opencti_granted_refs"
+                        ] = self.enrichment_shared_organizations
             bundle = json.dumps(bundle_data)
 
         # If execution in playbook, callback the api
@@ -1718,10 +1726,7 @@ def send_stix2_bundle(self, bundle: str, **kwargs) -> list:
             os.rename(write_file, final_write_file)
 
         stix2_splitter = OpenCTIStix2Splitter()
-        (
-            expectations_number,
-            bundles,
-        ) = stix2_splitter.split_bundle_with_expectations(
+        (expectations_number, bundles,) = stix2_splitter.split_bundle_with_expectations(
             bundle=bundle,
             use_json=True,
             event_version=event_version,

pycti/utils/opencti_logger.py

@@ -2,7 +2,7 @@
 import logging
 import os
 
-from pygelf import GelfUdpHandler, GelfTcpHandler
+from pygelf import GelfTcpHandler, GelfUdpHandler
 from pythonjsonlogger import jsonlogger
 
 
@@ -34,8 +34,15 @@ def filter(self, record):
         return True
 
 
-def logger(level, json_logging=True, graylog_host=None, graylog_port=None, graylog_adapter=None,
-           log_shipping_level=None, log_shipping_env_var_prefix=None):
+def logger(
+    level,
+    json_logging=True,
+    graylog_host=None,
+    graylog_port=None,
+    graylog_adapter=None,
+    log_shipping_level=None,
+    log_shipping_env_var_prefix=None,
+):
     # Exceptions
     logging.getLogger("urllib3").setLevel(logging.WARNING)
     logging.getLogger("pika").setLevel(logging.ERROR)
@@ -51,14 +58,21 @@ def logger(level, json_logging=True, graylog_host=None, graylog_port=None, grayl
 
     if graylog_host is not None:
         if graylog_adapter == "tcp":
-            shipping_handler = GelfTcpHandler(host=graylog_host, port=graylog_port, include_extra_fields=True)
+            shipping_handler = GelfTcpHandler(
+                host=graylog_host, port=graylog_port, include_extra_fields=True
+            )
         else:
-            shipping_handler = GelfUdpHandler(host=graylog_host, port=graylog_port, include_extra_fields=True)
+            shipping_handler = GelfUdpHandler(
+                host=graylog_host, port=graylog_port, include_extra_fields=True
+            )
         shipping_handler.setLevel(log_shipping_level)
 
         if log_shipping_env_var_prefix is not None:
-            filtered_env = [(k.removeprefix(log_shipping_env_var_prefix), v) for k, v in os.environ.items()
-                            if k.startswith(log_shipping_env_var_prefix)]
+            filtered_env = [
+                (k.removeprefix(log_shipping_env_var_prefix), v)
+                for k, v in os.environ.items()
+                if k.startswith(log_shipping_env_var_prefix)
+            ]
             shipping_filter = ContextFilter(filtered_env)
             shipping_handler.addFilter(shipping_filter)