Merge branch 'master' into release/current

Author: aHenryJard

.github/workflows/codeql-analysis.yml

@@ -24,6 +24,11 @@ on:
   schedule:
     - cron: "21 11 * * 0"
 
+permissions:
+  actions: read
+  contents: read
+  security-events: write
+
 jobs:
   analyze:
     name: Analyze

pycti/__init__.py

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

pycti/connector/opencti_connector_helper.py

@@ -376,6 +376,7 @@ def _data_handler(self, json_data) -> None:
                         e
                         for e in stix_objects
                         if e["id"] == opencti_entity["standard_id"]
+                        or e["id"] == "x-opencti-" + opencti_entity["standard_id"]
                     ][0]
                     event_data["stix_objects"] = stix_objects
                     event_data["stix_entity"] = stix_entity

pycti/entities/opencti_user.py

@@ -785,6 +785,28 @@ def token_renew(self, **kwargs) -> Optional[Dict]:
             result["data"]["userEdit"]["tokenRenew"]
         )
 
+    def send_mail(self, **kwargs):
+        id = kwargs.get("id", None)
+        template_id = kwargs.get("template_id", None)
+        if id is None or template_id is None:
+            self.opencti.admin_logger.error(
+                "[opencti_user] Missing parameters: id and template_id"
+            )
+
+        self.opencti.admin_logger.info(
+            "Send email to user", {"id": id, "template_id": template_id}
+        )
+        input = {
+            "target_user_id": id,
+            "email_template_id": template_id,
+        }
+        query = """
+                mutation SendUserMail($input: SendUserMailInput!) {
+                    sendUserMail(input: $input)
+                }
+            """
+        self.opencti.query(query, {"input": input})
+
     def process_multiple_fields(self, data):
         if "roles" in data:
             data["roles"] = self.opencti.process_multiple(data["roles"])

pycti/utils/opencti_stix2.py

@@ -2646,11 +2646,25 @@ def element_remove_groups(self, item):
                 {"type": item["type"]},
             )
 
+    def send_email(self, item):
+        template_id = self.opencti.get_attribute_in_extension("template_id", item)
+        if template_id is None:
+            template_id = item["template_id"]
+        if item["type"] == "user":
+            self.opencti.user.send_mail(id=item["id"], template_id=template_id[0])
+        else:
+            raise ValueError(
+                "Not supported opencti_operation for this type",
+                {"type": item["type"]},
+            )
+
     def element_operation_delete(self, item, operation):
         # If data is stix, just use the generic stix function for deletion
         force_delete = operation == "delete_force"
         if item["type"] == "relationship":
             self.opencti.stix_core_relationship.delete(id=item["id"])
+        elif item["type"] == "external-reference":
+            self.opencti.external_reference.delete(item["id"])
         elif item["type"] == "sighting":
             self.opencti.stix_sighting_relationship.delete(id=item["id"])
         elif item["type"] in STIX_META_OBJECTS:
@@ -2736,6 +2750,8 @@ def apply_opencti_operation(self, item, operation):
             self.element_add_groups(item)
         elif operation == "remove_groups":
             self.element_remove_groups(item)
+        elif operation == "send_email":
+            self.send_email(item=item)
         else:
             raise ValueError(
                 "Not supported opencti_operation",

requirements.txt

@@ -5,16 +5,16 @@ python-magic~=0.4.27; sys_platform == 'linux' or sys_platform == 'darwin'
 python-magic-bin~=0.4.14; sys_platform == 'win32'
 python_json_logger~=3.3.0
 PyYAML~=6.0
-pydantic~=2.11.3
-requests~=2.32.3
+pydantic>=2.8.2, <3
+requests>=2.32.0, <3
 setuptools~=80.9.0
 cachetools~=5.5.2
 prometheus-client~=0.22.1
 opentelemetry-api~=1.35.0
 opentelemetry-sdk~=1.35.0
 deprecation~=2.1.0
-fastapi>=0.116.1,<0.117.0
-uvicorn[standard]>=0.35.0,<0.36.0
+fastapi>=0.115.2, <1
+uvicorn[standard]>=0.34.0,<0.36.0
 # OpenCTI
 filigran-sseclient>=1.0.2
 stix2~=3.0.1

setup.cfg

@@ -37,20 +37,20 @@ install_requires =
     # Filigran
     datefinder~=0.7.3
     pika~=1.3.0
-    pydantic~=2.11.3
+    pydantic>=2.8.2, <3
     python-magic~=0.4.27; sys_platform == 'linux' or sys_platform == 'darwin'
     python-magic-bin~=0.4.14; sys_platform == 'win32'
     python_json_logger~=3.3.0
     PyYAML~=6.0
-    requests~=2.32.3
+    requests>=2.32.0, <3
     setuptools~=80.9.0
     cachetools~=5.5.2
     prometheus-client~=0.22.1
     opentelemetry-api~=1.35.0
     opentelemetry-sdk~=1.35.0
     deprecation~=2.1.0
-    fastapi>=0.116.1,<0.117.0
-    uvicorn[standard]>=0.35.0,<0.36.0
+    fastapi>=0.115.2,<0.117.0
+    uvicorn[standard]>=0.34.0,<0.36.0
     # OpenCTI
     filigran-sseclient>=1.0.2
     stix2~=3.0.1