pycti 6.1.5__py3-none-any.whl → 6.1.7__py3-none-any.whl

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/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/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/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/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/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.dist-info → pycti-6.1.7.dist-info}/METADATA

@@ -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.dist-info → pycti-6.1.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pycti/__init__.py,sha256=b5FShCuxuJX-8qUHy2fW2-JhkP-G6wnMEjS7d683cNQ,5035
+pycti/__init__.py,sha256=G7zZx8c-ClufD5_qLfKV8I0qLHgwxbGr0WoODBNJKA8,5035
 pycti/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycti/api/opencti_api_client.py,sha256=oTPEdzbSTtN1NMMDFqv_DIOXuUwNz8cN7oXu3saSXyA,29701
 pycti/api/opencti_api_connector.py,sha256=fYF0Jy9KIMFNt1RC_A1rpWomVJ-oj5HiSsBem4W0J5U,3549
@@ -6,7 +6,7 @@ pycti/api/opencti_api_playbook.py,sha256=OkqDawpnMYIHz5sD4djlJ_KgORkfvQ7YbJwttxE
 pycti/api/opencti_api_work.py,sha256=JLfl7oy6Cq9IrYW_kUrqwzN46FoVzyIn1JJQKyK0h_w,7615
 pycti/connector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycti/connector/opencti_connector.py,sha256=0vrZ8Y8ecbxegAP1YhpX6ybOZahYjjOkcId51D1oBi4,2449
-pycti/connector/opencti_connector_helper.py,sha256=mOlakQ077mZorpR7McXNLq4UXxsM2_00ES87M-HfQY8,60496
+pycti/connector/opencti_connector_helper.py,sha256=w_KAUr-anmomlejfZfUD4Pb3cha5cuI5NclXUlkbRww,61944
 pycti/connector/opencti_metric_handler.py,sha256=4jXHeJflomtHjuQ_YU0b36TG7o26vOWbY_jvU8Ezobs,3725
 pycti/entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycti/entities/opencti_attack_pattern.py,sha256=ycAR0cReJ1dd_edQPAL6qBrFvvTx10GJFMTezyK91cg,21471
@@ -41,12 +41,12 @@ pycti/entities/opencti_opinion.py,sha256=SPcY8-0zRJCMle-eDLka-CFPyAqU3CnVVBtfVYh
 pycti/entities/opencti_report.py,sha256=zKoq3Kpo3afvFsw0QCBOaeVm9J_xRMBOZfJC7ZPRaRg,33580
 pycti/entities/opencti_stix.py,sha256=uMheSg8i1f2Ozx2Mk0iShWzHHjj6MMWDtV5nDjVxKEE,2275
 pycti/entities/opencti_stix_core_object.py,sha256=3jABOB_-vm2CSB6LU3ylxpSj_oixRCcfU3T10n2_MFU,49559
-pycti/entities/opencti_stix_core_relationship.py,sha256=93E9sIiKIOYJtjzBecMBMOGoKNsgOJnrRi0HscmU6iA,43249
+pycti/entities/opencti_stix_core_relationship.py,sha256=U9eWrpV3iJ0_8x8Tn3ZBqiA2asT7AOJPNOq66abex00,43524
 pycti/entities/opencti_stix_cyber_observable.py,sha256=EOJuXeSmFcm4oI2rPOqxZ8QZq_ej_CTkYgCTtUkZwsk,106785
 pycti/entities/opencti_stix_domain_object.py,sha256=QI6uBbefNC_PQSwl0O5KpG4cWqa-15mIju8dwREzooU,78504
-pycti/entities/opencti_stix_nested_ref_relationship.py,sha256=2r1i7cUl-WWictlnC_MJrm9sTIt_yJe2uqTpQm-yo6o,12330
-pycti/entities/opencti_stix_object_or_stix_relationship.py,sha256=x0LWqMqaqqIPgQnLgw7Q2qPoXK4fZix8-KsQnmZaIOw,17696
-pycti/entities/opencti_stix_sighting_relationship.py,sha256=AmX1LBS8cW5a_dlik_sx-nBDvUcqb193gs4m3pB9C5U,27584
+pycti/entities/opencti_stix_nested_ref_relationship.py,sha256=eGCF7yaEDqMsJbgvTDle0tVzRCF78CmEhE02jioUTCc,12605
+pycti/entities/opencti_stix_object_or_stix_relationship.py,sha256=9P-yVkexzd-8sA_U5DhcgC6JzGtawZ8pQ_CPdbrTgy8,17935
+pycti/entities/opencti_stix_sighting_relationship.py,sha256=9huwEc3a1-5WvoaB1lYznh4s8rFzTat4EPHsiGebT-Y,27823
 pycti/entities/opencti_task.py,sha256=y4Q2vC-eLccX-yna85GnnCFEKWFJAWQcflNbkr9BClo,24668
 pycti/entities/opencti_threat_actor.py,sha256=lRdPhXX_HsNSE5rTwkke_U5T_FAPGD22ow2-YeZdaYc,9950
 pycti/entities/opencti_threat_actor_group.py,sha256=QQMt7D3RucIRczeVgcqAf3SurmkQLmK6QVI-M3d08p0,18996
@@ -61,8 +61,8 @@ pycti/utils/opencti_stix2.py,sha256=Ovv8mS7Df0FTNZwO2Vful8XNWY5PwNuyrrLC3bhiOqI,
 pycti/utils/opencti_stix2_splitter.py,sha256=A2GqoiFzEga8hslgA3mm4FDoObFsWgx4zK4DdcWTguc,4907
 pycti/utils/opencti_stix2_update.py,sha256=CnMyqkeVA0jgyxEcgqna8sABU4YPMjkEJ228GVurIn4,14658
 pycti/utils/opencti_stix2_utils.py,sha256=4r9qglN3AIN8JH1B9Ts2o20Qn3K203M4c5-lIPzRpZ4,4138
-pycti-6.1.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pycti-6.1.5.dist-info/METADATA,sha256=1_z_bdOGl8Ro1xuyV5Dw9nBP335Y1QaCGQaSBX3n0tI,5397
-pycti-6.1.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pycti-6.1.5.dist-info/top_level.txt,sha256=cqEpxitAhHP4VgSA6xmrak6Yk9MeBkwoMTB6k7d2ZnE,6
-pycti-6.1.5.dist-info/RECORD,,
+pycti-6.1.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pycti-6.1.7.dist-info/METADATA,sha256=CgniMR9hVR36qxJrzm_L0FXc7mgDEFI2xODvyWkdA4E,5397
+pycti-6.1.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+pycti-6.1.7.dist-info/top_level.txt,sha256=cqEpxitAhHP4VgSA6xmrak6Yk9MeBkwoMTB6k7d2ZnE,6
+pycti-6.1.7.dist-info/RECORD,,