pycti 6.1.5__tar.gz → 6.1.7__tar.gz

{pycti-6.1.5 → pycti-6.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycti
-Version: 6.1.5
+Version: 6.1.7
 Summary: Python API client for OpenCTI.
 Home-page: https://github.com/OpenCTI-Platform/client-python
 Author: Filigran

{pycti-6.1.5 → pycti-6.1.7}/pycti/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "6.1.5"
+__version__ = "6.1.7"
 
 from .api.opencti_api_client import OpenCTIApiClient
 from .api.opencti_api_connector import OpenCTIApiConnector

{pycti-6.1.5 → pycti-6.1.7}/pycti/connector/opencti_connector_helper.py

@@ -838,6 +838,45 @@ class OpenCTIConnectorHelper:  # pylint: disable=too-many-public-methods
         self.connector_state = connector_configuration["connector_state"]
         self.connector_config = connector_configuration["config"]
 
+        # Overwrite connector config for RabbitMQ if given manually / in conf
+        self.connector_config["connection"]["host"] = get_config_variable(
+            "MQ_HOST",
+            ["mq", "host"],
+            config,
+            default=self.connector_config["connection"]["host"],
+        )
+        self.connector_config["connection"]["port"] = get_config_variable(
+            "MQ_PORT",
+            ["mq", "port"],
+            config,
+            isNumber=True,
+            default=self.connector_config["connection"]["port"],
+        )
+        self.connector_config["connection"]["vhost"] = get_config_variable(
+            "MQ_VHOST",
+            ["mq", "vhost"],
+            config,
+            default=self.connector_config["connection"]["vhost"],
+        )
+        self.connector_config["connection"]["use_ssl"] = get_config_variable(
+            "MQ_USE_SSL",
+            ["mq", "use_ssl"],
+            config,
+            default=self.connector_config["connection"]["use_ssl"],
+        )
+        self.connector_config["connection"]["user"] = get_config_variable(
+            "MQ_USER",
+            ["mq", "user"],
+            config,
+            default=self.connector_config["connection"]["user"],
+        )
+        self.connector_config["connection"]["pass"] = get_config_variable(
+            "MQ_PASS",
+            ["mq", "pass"],
+            config,
+            default=self.connector_config["connection"]["pass"],
+        )
+
         # Start ping thread
         if not self.connect_run_and_terminate:
             self.ping = PingAlive(

{pycti-6.1.5 → pycti-6.1.7}/pycti/entities/opencti_stix_core_relationship.py

@@ -521,6 +521,7 @@ class StixCoreRelationship:
         start_time_stop = kwargs.get("startTimeStop", None)
         stop_time_start = kwargs.get("stopTimeStart", None)
         stop_time_stop = kwargs.get("stopTimeStop", None)
+        filters = kwargs.get("filters", None)
         custom_attributes = kwargs.get("customAttributes", None)
         if id is not None:
             self.opencti.app_logger.info("Reading stix_core_relationship", {"id": id})
@@ -543,6 +544,12 @@ class StixCoreRelationship:
             return self.opencti.process_multiple_fields(
                 result["data"]["stixCoreRelationship"]
             )
+        elif filters is not None:
+            result = self.list(filters=filters, customAttributes=custom_attributes)
+            if len(result) > 0:
+                return result[0]
+            else:
+                return None
         elif from_id is not None and to_id is not None:
             result = self.list(
                 fromOrToId=from_or_to_id,

{pycti-6.1.5 → pycti-6.1.7}/pycti/entities/opencti_stix_nested_ref_relationship.py

@@ -178,6 +178,7 @@ class StixNestedRefRelationship:
         stop_time_start = kwargs.get("stopTimeStart", None)
         stop_time_stop = kwargs.get("stopTimeStop", None)
         custom_attributes = kwargs.get("customAttributes", None)
+        filters = kwargs.get("filters", None)
         if id is not None:
             self.opencti.app_logger.info(
                 "Reading stix_observable_relationship", {"id": id}
@@ -201,6 +202,12 @@ class StixNestedRefRelationship:
             return self.opencti.process_multiple_fields(
                 result["data"]["stixRefRelationship"]
             )
+        elif filters is not None:
+            result = self.list(filters=filters, customAttributes=custom_attributes)
+            if len(result) > 0:
+                return result[0]
+            else:
+                return None
         else:
             result = self.list(
                 fromOrToId=from_or_to_id,

{pycti-6.1.5 → pycti-6.1.7}/pycti/entities/opencti_stix_object_or_stix_relationship.py

@@ -481,6 +481,7 @@ class StixObjectOrStixRelationship:
     def read(self, **kwargs):
         id = kwargs.get("id", None)
         custom_attributes = kwargs.get("customAttributes", None)
+        filters = kwargs.get("filters", None)
         if id is not None:
             self.opencti.app_logger.info(
                 "Reading StixObjectOrStixRelationship", {"id": id}
@@ -504,6 +505,12 @@ class StixObjectOrStixRelationship:
             return self.opencti.process_multiple_fields(
                 result["data"]["stixObjectOrStixRelationship"]
             )
+        elif filters is not None:
+            result = self.list(filters=filters)
+            if len(result) > 0:
+                return result[0]
+            else:
+                return None
         else:
             self.opencti.app_logger.error("Missing parameters: id")
             return None

{pycti-6.1.5 → pycti-6.1.7}/pycti/entities/opencti_stix_sighting_relationship.py

@@ -431,6 +431,7 @@ class StixSightingRelationship:
         last_seen_start = kwargs.get("lastSeenStart", None)
         last_seen_stop = kwargs.get("lastSeenStop", None)
         custom_attributes = kwargs.get("customAttributes", None)
+        filters = kwargs.get("filters", None)
         if id is not None:
             self.opencti.app_logger.info("Reading stix_sighting", {"id": id})
             query = (
@@ -452,6 +453,12 @@ class StixSightingRelationship:
             return self.opencti.process_multiple_fields(
                 result["data"]["stixSightingRelationship"]
             )
+        elif filters is not None:
+            result = self.list(filters=filters)
+            if len(result) > 0:
+                return result[0]
+            else:
+                return None
         elif from_id is not None and to_id is not None:
             result = self.list(
                 fromOrToId=from_or_to_id,

{pycti-6.1.5 → pycti-6.1.7}/pycti.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycti
-Version: 6.1.5
+Version: 6.1.7
 Summary: Python API client for OpenCTI.
 Home-page: https://github.com/OpenCTI-Platform/client-python
 Author: Filigran