pycti 5.12.21__tar.gz → 5.12.23__tar.gz

{pycti-5.12.21 → pycti-5.12.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycti
-Version: 5.12.21
+Version: 5.12.23
 Summary: Python API client for OpenCTI.
 Home-page: https://github.com/OpenCTI-Platform/client-python
 Author: Filigran
@@ -34,7 +34,7 @@ Requires-Dist: filigran-sseclient~=1.0.0
 Requires-Dist: stix2~=3.0.1
 Requires-Dist: cachetools~=5.3.0
 Provides-Extra: dev
-Requires-Dist: black~=23.12.0; extra == "dev"
+Requires-Dist: black~=24.1.0; extra == "dev"
 Requires-Dist: build~=1.0.3; extra == "dev"
 Requires-Dist: isort~=5.13.0; extra == "dev"
 Requires-Dist: types-pytz~=2023.3.1.0; extra == "dev"

{pycti-5.12.21 → pycti-5.12.23}/pycti/__init__.py

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

{pycti-5.12.21 → pycti-5.12.23}/pycti/connector/opencti_connector_helper.py

@@ -299,11 +299,11 @@ class ListenQueue(threading.Thread):
                     port=self.port,
                     virtual_host=self.vhost,
                     credentials=self.pika_credentials,
-                    ssl_options=pika.SSLOptions(
-                        create_mq_ssl_context(self.config), self.host
-                    )
-                    if self.use_ssl
-                    else None,
+                    ssl_options=(
+                        pika.SSLOptions(create_mq_ssl_context(self.config), self.host)
+                        if self.use_ssl
+                        else None
+                    ),
                 )
                 self.pika_connection = pika.BlockingConnection(self.pika_parameters)
                 self.channel = self.pika_connection.channel()
@@ -1035,12 +1035,14 @@ class OpenCTIConnectorHelper:  # pylint: disable=too-many-public-methods
             port=self.connector_config["connection"]["port"],
             virtual_host=self.connector_config["connection"]["vhost"],
             credentials=pika_credentials,
-            ssl_options=pika.SSLOptions(
-                create_mq_ssl_context(self.config),
-                self.connector_config["connection"]["host"],
-            )
-            if self.connector_config["connection"]["use_ssl"]
-            else None,
+            ssl_options=(
+                pika.SSLOptions(
+                    create_mq_ssl_context(self.config),
+                    self.connector_config["connection"]["host"],
+                )
+                if self.connector_config["connection"]["use_ssl"]
+                else None
+            ),
         )
         pika_connection = pika.BlockingConnection(pika_parameters)
         channel = pika_connection.channel()

{pycti-5.12.21 → pycti-5.12.23}/pycti/entities/opencti_attack_pattern.py

@@ -524,81 +524,99 @@ class AttackPattern:
                     else 0
                 )
             if "x_mitre_platforms" not in stix_object:
-                stix_object[
-                    "x_mitre_platforms"
-                ] = self.opencti.get_attribute_in_mitre_extension(
-                    "platforms", stix_object
+                stix_object["x_mitre_platforms"] = (
+                    self.opencti.get_attribute_in_mitre_extension(
+                        "platforms", stix_object
+                    )
                 )
             if "x_mitre_permissions_required" not in stix_object:
-                stix_object[
-                    "x_mitre_permissions_required"
-                ] = self.opencti.get_attribute_in_mitre_extension(
-                    "permissions_required", stix_object
+                stix_object["x_mitre_permissions_required"] = (
+                    self.opencti.get_attribute_in_mitre_extension(
+                        "permissions_required", stix_object
+                    )
                 )
             if "x_mitre_detection" not in stix_object:
-                stix_object[
-                    "x_mitre_detection"
-                ] = self.opencti.get_attribute_in_mitre_extension(
-                    "detection", stix_object
+                stix_object["x_mitre_detection"] = (
+                    self.opencti.get_attribute_in_mitre_extension(
+                        "detection", stix_object
+                    )
                 )
             if "x_opencti_stix_ids" not in stix_object:
-                stix_object[
-                    "x_opencti_stix_ids"
-                ] = self.opencti.get_attribute_in_extension("stix_ids", stix_object)
+                stix_object["x_opencti_stix_ids"] = (
+                    self.opencti.get_attribute_in_extension("stix_ids", stix_object)
+                )
             if "x_opencti_granted_refs" not in stix_object:
-                stix_object[
-                    "x_opencti_granted_refs"
-                ] = self.opencti.get_attribute_in_extension("granted_refs", stix_object)
+                stix_object["x_opencti_granted_refs"] = (
+                    self.opencti.get_attribute_in_extension("granted_refs", stix_object)
+                )
 
             return self.create(
                 stix_id=stix_object["id"],
-                createdBy=extras["created_by_id"]
-                if "created_by_id" in extras
-                else None,
-                objectMarking=extras["object_marking_ids"]
-                if "object_marking_ids" in extras
-                else None,
-                objectLabel=extras["object_label_ids"]
-                if "object_label_ids" in extras
-                else None,
-                externalReferences=extras["external_references_ids"]
-                if "external_references_ids" in extras
-                else None,
+                createdBy=(
+                    extras["created_by_id"] if "created_by_id" in extras else None
+                ),
+                objectMarking=(
+                    extras["object_marking_ids"]
+                    if "object_marking_ids" in extras
+                    else None
+                ),
+                objectLabel=(
+                    extras["object_label_ids"] if "object_label_ids" in extras else None
+                ),
+                externalReferences=(
+                    extras["external_references_ids"]
+                    if "external_references_ids" in extras
+                    else None
+                ),
                 revoked=stix_object["revoked"] if "revoked" in stix_object else None,
-                confidence=stix_object["confidence"]
-                if "confidence" in stix_object
-                else None,
+                confidence=(
+                    stix_object["confidence"] if "confidence" in stix_object else None
+                ),
                 lang=stix_object["lang"] if "lang" in stix_object else None,
                 created=stix_object["created"] if "created" in stix_object else None,
                 modified=stix_object["modified"] if "modified" in stix_object else None,
                 name=stix_object["name"],
-                description=self.opencti.stix2.convert_markdown(
-                    stix_object["description"]
-                )
-                if "description" in stix_object
-                else None,
+                description=(
+                    self.opencti.stix2.convert_markdown(stix_object["description"])
+                    if "description" in stix_object
+                    else None
+                ),
                 aliases=self.opencti.stix2.pick_aliases(stix_object),
-                x_mitre_platforms=stix_object["x_mitre_platforms"]
-                if "x_mitre_platforms" in stix_object
-                else stix_object["x_amitt_platforms"]
-                if "x_amitt_platforms" in stix_object
-                else None,
-                x_mitre_permissions_required=stix_object["x_mitre_permissions_required"]
-                if "x_mitre_permissions_required" in stix_object
-                else None,
-                x_mitre_detection=stix_object["x_mitre_detection"]
-                if "x_mitre_detection" in stix_object
-                else None,
+                x_mitre_platforms=(
+                    stix_object["x_mitre_platforms"]
+                    if "x_mitre_platforms" in stix_object
+                    else (
+                        stix_object["x_amitt_platforms"]
+                        if "x_amitt_platforms" in stix_object
+                        else None
+                    )
+                ),
+                x_mitre_permissions_required=(
+                    stix_object["x_mitre_permissions_required"]
+                    if "x_mitre_permissions_required" in stix_object
+                    else None
+                ),
+                x_mitre_detection=(
+                    stix_object["x_mitre_detection"]
+                    if "x_mitre_detection" in stix_object
+                    else None
+                ),
                 x_mitre_id=x_mitre_id,
-                killChainPhases=extras["kill_chain_phases_ids"]
-                if "kill_chain_phases_ids" in extras
-                else None,
-                x_opencti_stix_ids=stix_object["x_opencti_stix_ids"]
-                if "x_opencti_stix_ids" in stix_object
-                else None,
-                objectOrganization=stix_object["x_opencti_granted_refs"]
-                if "x_opencti_granted_refs" in stix_object
-                else None,
+                killChainPhases=(
+                    extras["kill_chain_phases_ids"]
+                    if "kill_chain_phases_ids" in extras
+                    else None
+                ),
+                x_opencti_stix_ids=(
+                    stix_object["x_opencti_stix_ids"]
+                    if "x_opencti_stix_ids" in stix_object
+                    else None
+                ),
+                objectOrganization=(
+                    stix_object["x_opencti_granted_refs"]
+                    if "x_opencti_granted_refs" in stix_object
+                    else None
+                ),
                 update=update,
             )
         else:

{pycti-5.12.21 → pycti-5.12.23}/pycti/entities/opencti_campaign.py

@@ -450,57 +450,65 @@ class Campaign:
         if stix_object is not None:
             # Search in extensions
             if "x_opencti_stix_ids" not in stix_object:
-                stix_object[
-                    "x_opencti_stix_ids"
-                ] = self.opencti.get_attribute_in_extension("stix_ids", stix_object)
+                stix_object["x_opencti_stix_ids"] = (
+                    self.opencti.get_attribute_in_extension("stix_ids", stix_object)
+                )
             if "x_opencti_granted_refs" not in stix_object:
-                stix_object[
-                    "x_opencti_granted_refs"
-                ] = self.opencti.get_attribute_in_extension("granted_refs", stix_object)
+                stix_object["x_opencti_granted_refs"] = (
+                    self.opencti.get_attribute_in_extension("granted_refs", stix_object)
+                )
 
             return self.create(
                 stix_id=stix_object["id"],
-                createdBy=extras["created_by_id"]
-                if "created_by_id" in extras
-                else None,
-                objectMarking=extras["object_marking_ids"]
-                if "object_marking_ids" in extras
-                else None,
-                objectLabel=extras["object_label_ids"]
-                if "object_label_ids" in extras
-                else None,
-                externalReferences=extras["external_references_ids"]
-                if "external_references_ids" in extras
-                else None,
+                createdBy=(
+                    extras["created_by_id"] if "created_by_id" in extras else None
+                ),
+                objectMarking=(
+                    extras["object_marking_ids"]
+                    if "object_marking_ids" in extras
+                    else None
+                ),
+                objectLabel=(
+                    extras["object_label_ids"] if "object_label_ids" in extras else None
+                ),
+                externalReferences=(
+                    extras["external_references_ids"]
+                    if "external_references_ids" in extras
+                    else None
+                ),
                 revoked=stix_object["revoked"] if "revoked" in stix_object else None,
-                confidence=stix_object["confidence"]
-                if "confidence" in stix_object
-                else None,
+                confidence=(
+                    stix_object["confidence"] if "confidence" in stix_object else None
+                ),
                 lang=stix_object["lang"] if "lang" in stix_object else None,
                 created=stix_object["created"] if "created" in stix_object else None,
                 modified=stix_object["modified"] if "modified" in stix_object else None,
                 name=stix_object["name"],
-                description=self.opencti.stix2.convert_markdown(
-                    stix_object["description"]
-                )
-                if "description" in stix_object
-                else None,
+                description=(
+                    self.opencti.stix2.convert_markdown(stix_object["description"])
+                    if "description" in stix_object
+                    else None
+                ),
                 aliases=self.opencti.stix2.pick_aliases(stix_object),
-                objective=stix_object["objective"]
-                if "objective" in stix_object
-                else None,
-                first_seen=stix_object["first_seen"]
-                if "first_seen" in stix_object
-                else None,
-                last_seen=stix_object["last_seen"]
-                if "last_seen" in stix_object
-                else None,
-                x_opencti_stix_ids=stix_object["x_opencti_stix_ids"]
-                if "x_opencti_stix_ids" in stix_object
-                else None,
-                objectOrganization=stix_object["x_opencti_granted_refs"]
-                if "x_opencti_granted_refs" in stix_object
-                else None,
+                objective=(
+                    stix_object["objective"] if "objective" in stix_object else None
+                ),
+                first_seen=(
+                    stix_object["first_seen"] if "first_seen" in stix_object else None
+                ),
+                last_seen=(
+                    stix_object["last_seen"] if "last_seen" in stix_object else None
+                ),
+                x_opencti_stix_ids=(
+                    stix_object["x_opencti_stix_ids"]
+                    if "x_opencti_stix_ids" in stix_object
+                    else None
+                ),
+                objectOrganization=(
+                    stix_object["x_opencti_granted_refs"]
+                    if "x_opencti_granted_refs" in stix_object
+                    else None
+                ),
                 update=update,
             )
         else:

{pycti-5.12.21 → pycti-5.12.23}/pycti/entities/opencti_case_incident.py

@@ -858,69 +858,83 @@ class CaseIncident:
         if stix_object is not None:
             # Search in extensions
             if "x_opencti_stix_ids" not in stix_object:
-                stix_object[
-                    "x_opencti_stix_ids"
-                ] = self.opencti.get_attribute_in_extension("stix_ids", stix_object)
+                stix_object["x_opencti_stix_ids"] = (
+                    self.opencti.get_attribute_in_extension("stix_ids", stix_object)
+                )
             if "x_opencti_granted_refs" not in stix_object:
-                stix_object[
-                    "x_opencti_granted_refs"
-                ] = self.opencti.get_attribute_in_extension("granted_refs", stix_object)
+                stix_object["x_opencti_granted_refs"] = (
+                    self.opencti.get_attribute_in_extension("granted_refs", stix_object)
+                )
             if "x_opencti_workflow_id" not in stix_object:
-                stix_object[
-                    "x_opencti_workflow_id"
-                ] = self.opencti.get_attribute_in_extension(
-                    "x_opencti_workflow_id", stix_object
+                stix_object["x_opencti_workflow_id"] = (
+                    self.opencti.get_attribute_in_extension(
+                        "x_opencti_workflow_id", stix_object
+                    )
                 )
             if "x_opencti_assignee_ids" not in stix_object:
-                stix_object[
-                    "x_opencti_assignee_ids"
-                ] = self.opencti.get_attribute_in_extension("assignee_ids", stix_object)
+                stix_object["x_opencti_assignee_ids"] = (
+                    self.opencti.get_attribute_in_extension("assignee_ids", stix_object)
+                )
 
             return self.create(
                 stix_id=stix_object["id"],
-                createdBy=extras["created_by_id"]
-                if "created_by_id" in extras
-                else None,
-                objectMarking=extras["object_marking_ids"]
-                if "object_marking_ids" in extras
-                else None,
-                objectLabel=extras["object_label_ids"]
-                if "object_label_ids" in extras
-                else None,
+                createdBy=(
+                    extras["created_by_id"] if "created_by_id" in extras else None
+                ),
+                objectMarking=(
+                    extras["object_marking_ids"]
+                    if "object_marking_ids" in extras
+                    else None
+                ),
+                objectLabel=(
+                    extras["object_label_ids"] if "object_label_ids" in extras else None
+                ),
                 objects=extras["object_ids"] if "object_ids" in extras else [],
-                externalReferences=extras["external_references_ids"]
-                if "external_references_ids" in extras
-                else None,
+                externalReferences=(
+                    extras["external_references_ids"]
+                    if "external_references_ids" in extras
+                    else None
+                ),
                 revoked=stix_object["revoked"] if "revoked" in stix_object else None,
-                confidence=stix_object["confidence"]
-                if "confidence" in stix_object
-                else None,
+                confidence=(
+                    stix_object["confidence"] if "confidence" in stix_object else None
+                ),
                 lang=stix_object["lang"] if "lang" in stix_object else None,
                 created=stix_object["created"] if "created" in stix_object else None,
                 modified=stix_object["modified"] if "modified" in stix_object else None,
                 name=stix_object["name"],
-                description=self.opencti.stix2.convert_markdown(
-                    stix_object["description"]
-                )
-                if "description" in stix_object
-                else None,
+                description=(
+                    self.opencti.stix2.convert_markdown(stix_object["description"])
+                    if "description" in stix_object
+                    else None
+                ),
                 severity=stix_object["severity"] if "severity" in stix_object else None,
                 priority=stix_object["priority"] if "priority" in stix_object else None,
-                response_types=stix_object["response_types"]
-                if "response_types" in stix_object
-                else None,
-                x_opencti_stix_ids=stix_object["x_opencti_stix_ids"]
-                if "x_opencti_stix_ids" in stix_object
-                else None,
-                objectOrganization=stix_object["x_opencti_granted_refs"]
-                if "x_opencti_granted_refs" in stix_object
-                else None,
-                objectAssignee=stix_object["x_opencti_assignee_ids"]
-                if "x_opencti_assignee_ids" in stix_object
-                else None,
-                x_opencti_workflow_id=stix_object["x_opencti_workflow_id"]
-                if "x_opencti_workflow_id" in stix_object
-                else None,
+                response_types=(
+                    stix_object["response_types"]
+                    if "response_types" in stix_object
+                    else None
+                ),
+                x_opencti_stix_ids=(
+                    stix_object["x_opencti_stix_ids"]
+                    if "x_opencti_stix_ids" in stix_object
+                    else None
+                ),
+                objectOrganization=(
+                    stix_object["x_opencti_granted_refs"]
+                    if "x_opencti_granted_refs" in stix_object
+                    else None
+                ),
+                objectAssignee=(
+                    stix_object["x_opencti_assignee_ids"]
+                    if "x_opencti_assignee_ids" in stix_object
+                    else None
+                ),
+                x_opencti_workflow_id=(
+                    stix_object["x_opencti_workflow_id"]
+                    if "x_opencti_workflow_id" in stix_object
+                    else None
+                ),
                 update=update,
             )
         else:

{pycti-5.12.21 → pycti-5.12.23}/pycti/entities/opencti_case_rfi.py

@@ -841,52 +841,62 @@ class CaseRfi:
         if stix_object is not None:
             # Search in extensions
             if "x_opencti_stix_ids" not in stix_object:
-                stix_object[
-                    "x_opencti_stix_ids"
-                ] = self.opencti.get_attribute_in_extension("stix_ids", stix_object)
+                stix_object["x_opencti_stix_ids"] = (
+                    self.opencti.get_attribute_in_extension("stix_ids", stix_object)
+                )
             if "x_opencti_granted_refs" not in stix_object:
-                stix_object[
-                    "x_opencti_granted_refs"
-                ] = self.opencti.get_attribute_in_extension("granted_refs", stix_object)
+                stix_object["x_opencti_granted_refs"] = (
+                    self.opencti.get_attribute_in_extension("granted_refs", stix_object)
+                )
 
             return self.create(
                 stix_id=stix_object["id"],
-                createdBy=extras["created_by_id"]
-                if "created_by_id" in extras
-                else None,
-                objectMarking=extras["object_marking_ids"]
-                if "object_marking_ids" in extras
-                else None,
-                objectLabel=extras["object_label_ids"]
-                if "object_label_ids" in extras
-                else None,
+                createdBy=(
+                    extras["created_by_id"] if "created_by_id" in extras else None
+                ),
+                objectMarking=(
+                    extras["object_marking_ids"]
+                    if "object_marking_ids" in extras
+                    else None
+                ),
+                objectLabel=(
+                    extras["object_label_ids"] if "object_label_ids" in extras else None
+                ),
                 objects=extras["object_ids"] if "object_ids" in extras else [],
-                externalReferences=extras["external_references_ids"]
-                if "external_references_ids" in extras
-                else None,
+                externalReferences=(
+                    extras["external_references_ids"]
+                    if "external_references_ids" in extras
+                    else None
+                ),
                 revoked=stix_object["revoked"] if "revoked" in stix_object else None,
-                confidence=stix_object["confidence"]
-                if "confidence" in stix_object
-                else None,
+                confidence=(
+                    stix_object["confidence"] if "confidence" in stix_object else None
+                ),
                 lang=stix_object["lang"] if "lang" in stix_object else None,
                 created=stix_object["created"] if "created" in stix_object else None,
                 modified=stix_object["modified"] if "modified" in stix_object else None,
                 name=stix_object["name"],
-                description=self.opencti.stix2.convert_markdown(
-                    stix_object["description"]
-                )
-                if "description" in stix_object
-                else None,
-                x_opencti_stix_ids=stix_object["x_opencti_stix_ids"]
-                if "x_opencti_stix_ids" in stix_object
-                else None,
-                objectOrganization=stix_object["x_opencti_granted_refs"]
-                if "x_opencti_granted_refs" in stix_object
-                else None,
+                description=(
+                    self.opencti.stix2.convert_markdown(stix_object["description"])
+                    if "description" in stix_object
+                    else None
+                ),
+                x_opencti_stix_ids=(
+                    stix_object["x_opencti_stix_ids"]
+                    if "x_opencti_stix_ids" in stix_object
+                    else None
+                ),
+                objectOrganization=(
+                    stix_object["x_opencti_granted_refs"]
+                    if "x_opencti_granted_refs" in stix_object
+                    else None
+                ),
                 update=update,
-                information_types=stix_object["information_types"]
-                if "information_types" in stix_object
-                else None,
+                information_types=(
+                    stix_object["information_types"]
+                    if "information_types" in stix_object
+                    else None
+                ),
             )
         else:
             self.opencti.app_logger.error(