Merge branch 'master' into renovate/pytest-8.x

Author: flavienSindou

docs/requirements.txt

@@ -1,4 +1,4 @@
 autoapi==2.0.1
 sphinx==7.4.6
 sphinx-autodoc-typehints==2.2.3
-sphinx_rtd_theme==2.0.0
+sphinx_rtd_theme==3.0.2

pycti/__init__.py

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

pycti/entities/opencti_case_incident.py

@@ -690,6 +690,7 @@ def create(self, **kwargs):
         priority = kwargs.get("priority", None)
         x_opencti_stix_ids = kwargs.get("x_opencti_stix_ids", None)
         object_assignee = kwargs.get("objectAssignee", None)
+        object_participant = kwargs.get("objectParticipant", None)
         granted_refs = kwargs.get("objectOrganization", None)
         response_types = kwargs.get("response_types", None)
         x_opencti_workflow_id = kwargs.get("x_opencti_workflow_id", None)
@@ -717,6 +718,7 @@ def create(self, **kwargs):
                         "objectLabel": object_label,
                         "objectOrganization": granted_refs,
                         "objectAssignee": object_assignee,
+                        "objectParticipant": object_participant,
                         "objects": objects,
                         "externalReferences": external_references,
                         "revoked": revoked,
@@ -865,7 +867,12 @@ def import_from_stix2(self, **kwargs):
                 stix_object["x_opencti_assignee_ids"] = (
                     self.opencti.get_attribute_in_extension("assignee_ids", stix_object)
                 )
-
+            if "x_opencti_participant_ids" not in stix_object:
+                stix_object["x_opencti_participant_ids"] = (
+                    self.opencti.get_attribute_in_extension(
+                        "participant_ids", stix_object
+                    )
+                )
             return self.create(
                 stix_id=stix_object["id"],
                 createdBy=(
@@ -920,6 +927,11 @@ def import_from_stix2(self, **kwargs):
                     if "x_opencti_assignee_ids" in stix_object
                     else None
                 ),
+                objectParticipant=(
+                    stix_object["x_opencti_participant_ids"]
+                    if "x_opencti_participant_ids" in stix_object
+                    else None
+                ),
                 x_opencti_workflow_id=(
                     stix_object["x_opencti_workflow_id"]
                     if "x_opencti_workflow_id" in stix_object

pycti/entities/opencti_case_rfi.py

@@ -674,6 +674,8 @@ def create(self, **kwargs):
         objects = kwargs.get("objects", None)
         object_marking = kwargs.get("objectMarking", None)
         object_label = kwargs.get("objectLabel", None)
+        object_assignee = kwargs.get("objectAssignee", None)
+        object_participant = kwargs.get("objectParticipant", None)
         external_references = kwargs.get("externalReferences", None)
         revoked = kwargs.get("revoked", None)
         confidence = kwargs.get("confidence", None)
@@ -709,6 +711,8 @@ def create(self, **kwargs):
                         "objectMarking": object_marking,
                         "objectLabel": object_label,
                         "objectOrganization": granted_refs,
+                        "objectAssignee": object_assignee,
+                        "objectParticipant": object_participant,
                         "objects": objects,
                         "externalReferences": external_references,
                         "revoked": revoked,
@@ -846,6 +850,16 @@ def import_from_stix2(self, **kwargs):
                 stix_object["x_opencti_workflow_id"] = (
                     self.opencti.get_attribute_in_extension("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)
+                )
+            if "x_opencti_participant_ids" not in stix_object:
+                stix_object["x_opencti_participant_ids"] = (
+                    self.opencti.get_attribute_in_extension(
+                        "participant_ids", stix_object
+                    )
+                )
 
             return self.create(
                 stix_id=stix_object["id"],
@@ -889,6 +903,16 @@ def import_from_stix2(self, **kwargs):
                     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
+                ),
+                objectParticipant=(
+                    stix_object["x_opencti_participant_ids"]
+                    if "x_opencti_participant_ids" in stix_object
+                    else None
+                ),
                 x_opencti_workflow_id=(
                     stix_object["x_opencti_workflow_id"]
                     if "x_opencti_workflow_id" in stix_object

pycti/entities/opencti_case_rft.py

@@ -673,6 +673,8 @@ def create(self, **kwargs):
         objects = kwargs.get("objects", None)
         object_marking = kwargs.get("objectMarking", None)
         object_label = kwargs.get("objectLabel", None)
+        object_assignee = kwargs.get("objectAssignee", None)
+        object_participant = kwargs.get("objectParticipant", None)
         external_references = kwargs.get("externalReferences", None)
         revoked = kwargs.get("revoked", None)
         confidence = kwargs.get("confidence", None)
@@ -708,6 +710,8 @@ def create(self, **kwargs):
                         "objectMarking": object_marking,
                         "objectLabel": object_label,
                         "objectOrganization": granted_refs,
+                        "objectAssignee": object_assignee,
+                        "objectParticipant": object_participant,
                         "objects": objects,
                         "externalReferences": external_references,
                         "revoked": revoked,
@@ -845,7 +849,16 @@ def import_from_stix2(self, **kwargs):
                 stix_object["x_opencti_workflow_id"] = (
                     self.opencti.get_attribute_in_extension("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)
+                )
+            if "x_opencti_participant_ids" not in stix_object:
+                stix_object["x_opencti_participant_ids"] = (
+                    self.opencti.get_attribute_in_extension(
+                        "participant_ids", stix_object
+                    )
+                )
             return self.create(
                 stix_id=stix_object["id"],
                 createdBy=(
@@ -893,6 +906,16 @@ def import_from_stix2(self, **kwargs):
                     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
+                ),
+                objectParticipant=(
+                    stix_object["x_opencti_participant_ids"]
+                    if "x_opencti_participant_ids" in stix_object
+                    else None
+                ),
                 x_opencti_workflow_id=(
                     stix_object["x_opencti_workflow_id"]
                     if "x_opencti_workflow_id" in stix_object

pycti/entities/opencti_task.py

@@ -448,6 +448,7 @@ def create(self, **kwargs):
         object_marking = kwargs.get("objectMarking", None)
         object_label = kwargs.get("objectLabel", None)
         object_assignee = kwargs.get("objectAssignee", None)
+        object_participant = kwargs.get("objectParticipant", None)
         granted_refs = kwargs.get("objectOrganization", None)
         x_opencti_workflow_id = kwargs.get("x_opencti_workflow_id", None)
         update = kwargs.get("update", False)
@@ -478,6 +479,7 @@ def create(self, **kwargs):
                         "objectMarking": object_marking,
                         "objectOrganization": granted_refs,
                         "objectAssignee": object_assignee,
+                        "objectParticipant": object_participant,
                         "x_opencti_workflow_id": x_opencti_workflow_id,
                         "update": update,
                     }
@@ -628,7 +630,12 @@ def import_from_stix2(self, **kwargs):
                 stix_object["x_opencti_assignee_ids"] = (
                     self.opencti.get_attribute_in_extension("assignee_ids", stix_object)
                 )
-
+            if "x_opencti_participant_ids" not in stix_object:
+                stix_object["x_opencti_participant_ids"] = (
+                    self.opencti.get_attribute_in_extension(
+                        "participant_ids", stix_object
+                    )
+                )
             return self.create(
                 stix_id=stix_object["id"],
                 createdBy=(
@@ -661,6 +668,11 @@ def import_from_stix2(self, **kwargs):
                     if "x_opencti_assignee_ids" in stix_object
                     else None
                 ),
+                objectParticipant=(
+                    stix_object["x_opencti_participant_ids"]
+                    if "x_opencti_participant_ids" in stix_object
+                    else None
+                ),
                 x_opencti_workflow_id=(
                     stix_object["x_opencti_workflow_id"]
                     if "x_opencti_workflow_id" in stix_object

renovate.json

@@ -1,17 +1,23 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base"
-  ],
-  "labels": [
-    "dependencies",
-    "filigran team"
-  ],
-  "prConcurrentLimit": 2,
-  "packageRules": [
-    {
-      "matchUpdateTypes": ["minor"],
-      "prPriority": 5
-    }
-  ]
-}
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ],
+  "labels": [
+    "dependencies",
+    "filigran team"
+  ],
+  "prConcurrentLimit": 2,
+  "packageRules": [
+    {
+      "matchUpdateTypes": ["minor"],
+      "prPriority": 5
+    }
+  ],
+  "timezone": "Europe/Paris",
+  "schedule": [
+    "after 10pm and before 5am every weekday",
+    "every weekend"
+  ],
+  "updateNotScheduled": false
+}

requirements.txt

@@ -5,14 +5,14 @@ python-magic~=0.4.27; sys_platform == 'linux' or sys_platform == 'darwin'
 python-magic-bin~=0.4.14; sys_platform == 'win32'
 python_json_logger~=2.0.4
 PyYAML~=6.0
-pydantic~=2.8.2
+pydantic~=2.10.4
 requests~=2.32.2
 setuptools~=71.1.0
-cachetools~=5.4.0
-prometheus-client~=0.20.0
+cachetools~=5.5.0
+prometheus-client~=0.21.1
 opentelemetry-api~=1.22.0
 opentelemetry-sdk~=1.22.0
 deprecation~=2.1.0
 # OpenCTI
-filigran-sseclient~=1.0.0
+filigran-sseclient>=1.0.2
 stix2~=3.0.1

setup.cfg

@@ -37,32 +37,32 @@ install_requires =
     # Filigran
     datefinder~=0.7.3
     pika~=1.3.0
-    pydantic~=2.8.2
+    pydantic~=2.10.4
     python-magic~=0.4.27; sys_platform == 'linux' or sys_platform == 'darwin'
     python-magic-bin~=0.4.14; sys_platform == 'win32'
     python_json_logger~=2.0.4
     PyYAML~=6.0
     requests~=2.32.2
     setuptools~=71.1.0
-    cachetools~=5.4.0
-    prometheus-client~=0.20.0
+    cachetools~=5.5.0
+    prometheus-client~=0.21.1
     opentelemetry-api~=1.22.0
     opentelemetry-sdk~=1.22.0
     deprecation~=2.1.0
     # OpenCTI
-    filigran-sseclient~=1.0.0
+    filigran-sseclient>=1.0.2
     stix2~=3.0.1
 
 [options.extras_require]
 dev =
     black~=24.4.0
     build~=1.2.1
     isort~=5.13.0
-    types-pytz~=2024.1.0.20240203
-    pre-commit~=3.7.0
+    types-pytz~=2024.2.0.20241221
+    pre-commit~=3.8.0
     pytest-cases~=3.8.0
     pytest-cov~=5.0.0
-    pytest_randomly~=3.15.0
+    pytest_randomly~=3.16.0
     pytest~=8.3.4
     types-python-dateutil~=2.9.0
     wheel~=0.43.0