pycti 6.0.7__py3-none-any.whl → 6.0.9__py3-none-any.whl

pycti/__init__.py

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

pycti/connector/opencti_connector_helper.py

@@ -424,7 +424,7 @@ class PingAlive(threading.Thread):
     def __init__(
         self, connector_logger, connector_id, api, get_state, set_state, metric
     ) -> None:
-        threading.Thread.__init__(self)
+        threading.Thread.__init__(self, daemon=True)
         self.connector_logger = connector_logger
         self.connector_id = connector_id
         self.in_error = False

pycti/entities/opencti_malware.py

@@ -108,6 +108,9 @@ class Malware:
               created
               modified
             }
+            samples {
+                id
+            }
         """
         self.properties_with_files = """
             id
@@ -221,6 +224,9 @@ class Malware:
               created
               modified
             }
+            samples {
+                id
+            }
             importFiles {
                 edges {
                     node {
@@ -411,6 +417,7 @@ class Malware:
         x_opencti_stix_ids = kwargs.get("x_opencti_stix_ids", None)
         granted_refs = kwargs.get("objectOrganization", None)
         x_opencti_workflow_id = kwargs.get("x_opencti_workflow_id", None)
+        samples = kwargs.get("samples", None)
         update = kwargs.get("update", False)
 
         if name is not None:
@@ -453,6 +460,7 @@ class Malware:
                         "killChainPhases": kill_chain_phases,
                         "x_opencti_stix_ids": x_opencti_stix_ids,
                         "x_opencti_workflow_id": x_opencti_workflow_id,
+                        "samples": samples,
                         "update": update,
                     }
                 },
@@ -572,6 +580,7 @@ class Malware:
                     if "x_opencti_workflow_id" in stix_object
                     else None
                 ),
+                samples=(extras["sample_ids"] if "sample_ids" in extras else None),
                 update=update,
             )
         else:

pycti/entities/opencti_stix_cyber_observable.py

@@ -2349,13 +2349,9 @@ class StixCyberObservable:
                                             created
                                             modified
                                             objectLabel {
-                                                edges {
-                                                    node {
-                                                        id
-                                                        value
-                                                        color
-                                                    }
-                                                }
+                                                id
+                                                value
+                                                color
                                             }
                                         }
                                         ... on Organization {
@@ -2480,13 +2476,9 @@ class StixCyberObservable:
                                             created
                                             modified
                                             objectLabel {
-                                                edges {
-                                                    node {
-                                                        id
-                                                        value
-                                                        color
-                                                    }
-                                                }
+                                                id
+                                                value
+                                                color
                                             }
                                         }
                                         ... on Organization {
@@ -2612,13 +2604,9 @@ class StixCyberObservable:
                                                 created
                                                 modified
                                                 objectLabel {
-                                                    edges {
-                                                        node {
-                                                            id
-                                                            value
-                                                            color
-                                                        }
-                                                    }
+                                                    id
+                                                    value
+                                                    color
                                                 }
                                             }
                                             ... on Organization {

pycti/entities/opencti_stix_domain_object.py

@@ -1851,13 +1851,9 @@ class StixDomainObject:
                                             created
                                             modified
                                             objectLabel {
-                                                edges {
-                                                    node {
-                                                        id
-                                                        value
-                                                        color
-                                                    }
-                                                }
+                                                id
+                                                value
+                                                color
                                             }
                                         }
                                         ... on Organization {
@@ -1982,13 +1978,9 @@ class StixDomainObject:
                                             created
                                             modified
                                             objectLabel {
-                                                edges {
-                                                    node {
-                                                        id
-                                                        value
-                                                        color
-                                                    }
-                                                }
+                                                id
+                                                value
+                                                color
                                             }
                                         }
                                         ... on Organization {
@@ -2114,13 +2106,9 @@ class StixDomainObject:
                                                 created
                                                 modified
                                                 objectLabel {
-                                                    edges {
-                                                        node {
-                                                            id
-                                                            value
-                                                            color
-                                                        }
-                                                    }
+                                                    id
+                                                    value
+                                                    color
                                                 }
                                             }
                                             ... on Organization {

pycti/utils/opencti_stix2.py

@@ -770,6 +770,10 @@ class OpenCTIStix2:
             )
         elif "x_opencti_granted_refs" in stix_object:
             granted_refs_ids = stix_object["x_opencti_granted_refs"]
+        # Sample refs
+        sample_refs_ids = (
+            stix_object["sample_refs"] if "sample_refs" in stix_object else []
+        )
 
         return {
             "created_by": created_by_id,
@@ -779,6 +783,7 @@ class OpenCTIStix2:
             "kill_chain_phases": kill_chain_phases_ids,
             "object_refs": object_refs_ids,
             "granted_refs": granted_refs_ids,
+            "sample_refs": sample_refs_ids,
             "external_references": external_references_ids,
             "reports": reports,
         }
@@ -863,6 +868,7 @@ class OpenCTIStix2:
         object_refs_ids = embedded_relationships["object_refs"]
         external_references_ids = embedded_relationships["external_references"]
         reports = embedded_relationships["reports"]
+        sample_refs_ids = embedded_relationships["sample_refs"]
 
         # Extra
         extras = {
@@ -874,6 +880,7 @@ class OpenCTIStix2:
             "object_ids": object_refs_ids,
             "external_references_ids": external_references_ids,
             "reports": reports,
+            "sample_ids": sample_refs_ids,
         }
 
         # Import
@@ -1000,6 +1007,7 @@ class OpenCTIStix2:
         object_refs_ids = embedded_relationships["object_refs"]
         external_references_ids = embedded_relationships["external_references"]
         reports = embedded_relationships["reports"]
+        sample_refs_ids = embedded_relationships["sample_refs"]
 
         # Extra
         extras = {
@@ -1012,6 +1020,7 @@ class OpenCTIStix2:
             "object_ids": object_refs_ids,
             "external_references_ids": external_references_ids,
             "reports": reports,
+            "sample_ids": sample_refs_ids,
         }
         if stix_object["type"] == "simple-observable":
             stix_observable_result = self.opencti.stix_cyber_observable.create(
@@ -1176,6 +1185,7 @@ class OpenCTIStix2:
         object_refs_ids = embedded_relationships["object_refs"]
         external_references_ids = embedded_relationships["external_references"]
         reports = embedded_relationships["reports"]
+        sample_refs_ids = embedded_relationships["sample_refs"]
 
         # Extra
         extras = {
@@ -1188,6 +1198,7 @@ class OpenCTIStix2:
             "object_ids": object_refs_ids,
             "external_references_ids": external_references_ids,
             "reports": reports,
+            "sample_ids": sample_refs_ids,
         }
 
         # Create the relation
@@ -1271,6 +1282,7 @@ class OpenCTIStix2:
         object_refs_ids = embedded_relationships["object_refs"]
         external_references_ids = embedded_relationships["external_references"]
         reports = embedded_relationships["reports"]
+        sample_refs_ids = embedded_relationships["sample_refs"]
 
         # Extra
         extras = {
@@ -1283,6 +1295,7 @@ class OpenCTIStix2:
             "object_ids": object_refs_ids,
             "external_references_ids": external_references_ids,
             "reports": reports,
+            "sample_ids": sample_refs_ids,
         }
 
         # Create the sighting

{pycti-6.0.7.dist-info → pycti-6.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycti
-Version: 6.0.7
+Version: 6.0.9
 Summary: Python API client for OpenCTI.
 Home-page: https://github.com/OpenCTI-Platform/client-python
 Author: Filigran
@@ -27,23 +27,23 @@ Requires-Dist: prometheus-client ~=0.20.0
 Requires-Dist: python-json-logger ~=2.0.4
 Requires-Dist: pyyaml ~=6.0
 Requires-Dist: requests ~=2.31.0
-Requires-Dist: setuptools ~=69.1.0
+Requires-Dist: setuptools ~=69.2.0
 Requires-Dist: filigran-sseclient ~=1.0.0
 Requires-Dist: stix2 ~=3.0.1
 Requires-Dist: cachetools ~=5.3.0
 Requires-Dist: python-magic ~=0.4.27 ; sys_platform == "linux" or sys_platform == "darwin"
 Requires-Dist: python-magic-bin ~=0.4.14 ; sys_platform == "win32"
 Provides-Extra: dev
-Requires-Dist: black ~=24.2.0 ; extra == 'dev'
-Requires-Dist: build ~=1.1.1 ; extra == 'dev'
+Requires-Dist: black ~=24.3.0 ; extra == 'dev'
+Requires-Dist: build ~=1.2.1 ; extra == 'dev'
 Requires-Dist: isort ~=5.13.0 ; extra == 'dev'
 Requires-Dist: types-pytz ~=2024.1.0.20240203 ; extra == 'dev'
-Requires-Dist: pre-commit ~=3.6.0 ; extra == 'dev'
+Requires-Dist: pre-commit ~=3.7.0 ; extra == 'dev'
 Requires-Dist: pytest-cases ~=3.8.0 ; extra == 'dev'
-Requires-Dist: pytest-cov ~=4.1.0 ; extra == 'dev'
+Requires-Dist: pytest-cov ~=5.0.0 ; extra == 'dev'
 Requires-Dist: pytest-randomly ~=3.15.0 ; extra == 'dev'
-Requires-Dist: pytest ~=7.4.0 ; extra == 'dev'
-Requires-Dist: types-python-dateutil ~=2.8.19 ; extra == 'dev'
+Requires-Dist: pytest ~=8.1.1 ; extra == 'dev'
+Requires-Dist: types-python-dateutil ~=2.9.0 ; extra == 'dev'
 Requires-Dist: wheel ~=0.43.0 ; extra == 'dev'
 Provides-Extra: doc
 Requires-Dist: autoapi ~=2.0.1 ; extra == 'doc'

{pycti-6.0.7.dist-info → pycti-6.0.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pycti/__init__.py,sha256=cjg2zj_I_xjO9dBQrX-KrYuvGb4yCOg-xzvtHlPHvqs,4691
+pycti/__init__.py,sha256=GdlQYeIZIUhUWOCEzAePIhesbjizdBVR4rEuIkWUvyo,4691
 pycti/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycti/api/opencti_api_client.py,sha256=Jhzsl17JL78IphkbkM1ujLP4Pa8PfIGtUNkEcNRjHxM,28980
 pycti/api/opencti_api_connector.py,sha256=fYF0Jy9KIMFNt1RC_A1rpWomVJ-oj5HiSsBem4W0J5U,3549
@@ -6,7 +6,7 @@ pycti/api/opencti_api_playbook.py,sha256=Wcf-G__IHmR7LwtUFVUVx4Skg9e2mcb89n_HyfW
 pycti/api/opencti_api_work.py,sha256=ow30gswv4k5zLlZGlvLAn47ZM07RLsYvEV-KwtwedQg,7109
 pycti/connector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycti/connector/opencti_connector.py,sha256=0vrZ8Y8ecbxegAP1YhpX6ybOZahYjjOkcId51D1oBi4,2449
-pycti/connector/opencti_connector_helper.py,sha256=GexhITraTCNxLhy84n2jVHx8EOJU02qljeuj9vaxh8k,55822
+pycti/connector/opencti_connector_helper.py,sha256=hWoh3NKJvCo2kVEiZby3pt67zlz0guJ23zwErUZbah4,55835
 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
@@ -31,7 +31,7 @@ pycti/entities/opencti_kill_chain_phase.py,sha256=a509rFeIchPRlO5rMHPVxrxfUuTbV4
 pycti/entities/opencti_label.py,sha256=6RZJPIa_dXf_YNNU4xXKghfBnpNjhU5YXOaSIcB4YrM,8800
 pycti/entities/opencti_language.py,sha256=eHB7qzf_l2Mno_Wy9kF0QUdcBktWgr4kRHhb9AxT0c0,16176
 pycti/entities/opencti_location.py,sha256=uet-YxkvTvcD2rh2VbQM2hS7F9Uj-dwmXixSJOKN5zs,16970
-pycti/entities/opencti_malware.py,sha256=h5RyScDFwbYaJtTxH9gUVBwJG4fAvcnoUpuI9HeT254,20127
+pycti/entities/opencti_malware.py,sha256=TNz-HDbvcBxyPn9GwSnNVlVljg274HkxgJw62-OoyKc,20411
 pycti/entities/opencti_malware_analysis.py,sha256=grOJTiuZfCU464AgnF-VDO97geFfKNCR-SW40SiewNQ,20904
 pycti/entities/opencti_marking_definition.py,sha256=2HkU58XWOZHuEFXrscshQIHW-KVyZSr02JRzBQYZirI,12862
 pycti/entities/opencti_narrative.py,sha256=qiuFQub04pvArYf5hHJEgZtneR7p-VQq5YywiN-rlRM,16468
@@ -42,8 +42,8 @@ pycti/entities/opencti_report.py,sha256=tSMSCsAGgZny94EjFtidEws7Uf0gBI-nPHwkqPg2
 pycti/entities/opencti_stix.py,sha256=uMheSg8i1f2Ozx2Mk0iShWzHHjj6MMWDtV5nDjVxKEE,2275
 pycti/entities/opencti_stix_core_object.py,sha256=QRiAk5_loi4JLJN4aXSq8DTwFFzOLhbA7Y-2R3aO8kw,48728
 pycti/entities/opencti_stix_core_relationship.py,sha256=cD825areOn2quv06M28YGE7A3bTQ8_Pxx1QW6JyoQBs,42895
-pycti/entities/opencti_stix_cyber_observable.py,sha256=GzxaI3q28FURIPQFa6WapiPG90mNCR0zDlTar2UgEcE,104716
-pycti/entities/opencti_stix_domain_object.py,sha256=xjU7-ew7nPbAf3U0uHC8TtC4n9leoMRklOHOUGIkdZk,78743
+pycti/entities/opencti_stix_cyber_observable.py,sha256=IcHNnRKjJxQ_7adlIzYzUV3XUvvcac0w9fe_hQp5eic,103971
+pycti/entities/opencti_stix_domain_object.py,sha256=04q7gQZ-hgpsjsyvXh6VOYmRJOPwOrdAPlzUmzlM5mc,77998
 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=NOJdUU9cm_gMBne13EZPb8cfxOhTfgVVmv8A0yasQeI,14610
 pycti/entities/opencti_stix_sighting_relationship.py,sha256=AmX1LBS8cW5a_dlik_sx-nBDvUcqb193gs4m3pB9C5U,27584
@@ -57,12 +57,12 @@ pycti/entities/opencti_vulnerability.py,sha256=dzJ0fZB2XrkPwT-cANr6atzYOWXF5nk0a
 pycti/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycti/utils/constants.py,sha256=mAAeNGXyHU89yp8lihXBKF9fKncQCKwyxD2PVz5D2wI,7915
 pycti/utils/opencti_logger.py,sha256=0dvB75V0SuPFGxL539dAQrxTt1N5Acx0A3Ogwl5WMJ8,2199
-pycti/utils/opencti_stix2.py,sha256=h3MwVwynRvHPQ2Al54OVQYjCoSrGGfkuoQXn5pB1Avw,111579
+pycti/utils/opencti_stix2.py,sha256=UtTLdX88lGqoQClwZC9z2wNjje3X8BSk2Pe5HsNTyEc,112190
 pycti/utils/opencti_stix2_splitter.py,sha256=Ht9Mp-W3gbwxIKEr7i_5NYpcDr3TA2gYdC4TzOz0G4c,4496
 pycti/utils/opencti_stix2_update.py,sha256=CnMyqkeVA0jgyxEcgqna8sABU4YPMjkEJ228GVurIn4,14658
 pycti/utils/opencti_stix2_utils.py,sha256=_ijIz6SRP2OeIaWJcXJt8go510MUEGfWE3KY-I_9QZc,3725
-pycti-6.0.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pycti-6.0.7.dist-info/METADATA,sha256=JmSdP4Iem0pWIzz8VtYQJs6ajqnDFF7RlPV5tJHOz6Y,5314
-pycti-6.0.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pycti-6.0.7.dist-info/top_level.txt,sha256=cqEpxitAhHP4VgSA6xmrak6Yk9MeBkwoMTB6k7d2ZnE,6
-pycti-6.0.7.dist-info/RECORD,,
+pycti-6.0.9.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pycti-6.0.9.dist-info/METADATA,sha256=98nnsJbWJUYzZNQZqU-K1uIafVcirHpS3skSAC-TN70,5313
+pycti-6.0.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+pycti-6.0.9.dist-info/top_level.txt,sha256=cqEpxitAhHP4VgSA6xmrak6Yk9MeBkwoMTB6k7d2ZnE,6
+pycti-6.0.9.dist-info/RECORD,,