Merge branch 'master' into release/current

Author: JeremyCloarec

.github/workflows/check-verified-commit.yml

@@ -0,0 +1,19 @@
+name: Check signed commits in PR 
+on: [pull_request,pull_request_target]
+jobs:
+  check-signed-commits:
+    name: Check signed commits in PR
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+    - name: Information about how to sign commits see https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits
+      # "with comment" below does not work for forks.
+      run: |
+        echo "If you need to sign commits, Please see https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits"
+    - name: Check signed commits in PR on fail see above information.
+      uses: 1Password/check-signed-commits-action@v1
+      with:
+        comment: |
+          Thank you for your contribution, but we need you to sign your commits. Please see https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits

pycti/__init__.py

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

pycti/utils/opencti_stix2.py

@@ -2511,6 +2511,10 @@ def apply_patch(self, item):
                 self.opencti.notification.update_field(
                     id=item_id, input=field_patch_without_files
                 )
+            elif item["type"] == "user":
+                self.opencti.user.update_field(
+                    id=item_id, input=field_patch_without_files
+                )
             else:
                 self.opencti.stix_domain_object.update_field(
                     id=item_id, input=field_patch_without_files
@@ -2583,6 +2587,65 @@ def organization_unshare(self, item):
                 item["id"], organization_ids, sharing_direct_container
             )
 
+    def element_add_organizations(self, item):
+        organization_ids = self.opencti.get_attribute_in_extension(
+            "organization_ids", item
+        )
+        if organization_ids is None:
+            organization_ids = item["organization_ids"]
+        if item["type"] == "user":
+            for organization_id in organization_ids:
+                self.opencti.user.add_organization(
+                    id=item["id"], organization_id=organization_id
+                )
+        else:
+            raise ValueError(
+                "Add organizations operation not compatible with type",
+                {"type": item["type"]},
+            )
+
+    def element_remove_organizations(self, item):
+        organization_ids = self.opencti.get_attribute_in_extension(
+            "organization_ids", item
+        )
+        if organization_ids is None:
+            organization_ids = item["organization_ids"]
+        if item["type"] == "user":
+            for organization_id in organization_ids:
+                self.opencti.user.delete_organization(
+                    id=item["id"], organization_id=organization_id
+                )
+        else:
+            raise ValueError(
+                "Remove organizations operation not compatible with type",
+                {"type": item["type"]},
+            )
+
+    def element_add_groups(self, item):
+        group_ids = self.opencti.get_attribute_in_extension("group_ids", item)
+        if group_ids is None:
+            group_ids = item["group_ids"]
+        if item["type"] == "user":
+            for group_id in group_ids:
+                self.opencti.user.add_membership(id=item["id"], group_id=group_id)
+        else:
+            raise ValueError(
+                "Add groups operation not compatible with type", {"type": item["type"]}
+            )
+
+    def element_remove_groups(self, item):
+        group_ids = self.opencti.get_attribute_in_extension("group_ids", item)
+        if group_ids is None:
+            group_ids = item["group_ids"]
+        if item["type"] == "user":
+            for group_id in group_ids:
+                self.opencti.user.delete_membership(id=item["id"], group_id=group_id)
+        else:
+            raise ValueError(
+                "Remove groups operation not compatible with 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"
@@ -2665,6 +2728,14 @@ def apply_opencti_operation(self, item, operation):
             self.opencti.stix_core_object.ask_enrichments(
                 element_id=item["id"], connector_ids=connector_ids
             )
+        elif operation == "add_organizations":
+            self.element_add_organizations(item)
+        elif operation == "remove_organizations":
+            self.element_remove_organizations(item)
+        elif operation == "add_groups":
+            self.element_add_groups(item)
+        elif operation == "remove_groups":
+            self.element_remove_groups(item)
         else:
             raise ValueError(
                 "Not supported opencti_operation",

requirements.txt

@@ -8,13 +8,13 @@ PyYAML~=6.0
 pydantic~=2.11.3
 requests~=2.32.3
 setuptools~=80.9.0
-cachetools~=5.5.0
-prometheus-client~=0.21.1
-opentelemetry-api~=1.32.0
-opentelemetry-sdk~=1.32.0
+cachetools~=6.1.0
+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.33.0,<0.35.0
+uvicorn[standard]>=0.35.0,<0.36.0
 # OpenCTI
 filigran-sseclient>=1.0.2
 stix2~=3.0.1

setup.cfg

@@ -44,13 +44,13 @@ install_requires =
     PyYAML~=6.0
     requests~=2.32.3
     setuptools~=80.9.0
-    cachetools~=5.5.0
-    prometheus-client~=0.21.1
-    opentelemetry-api~=1.32.0
-    opentelemetry-sdk~=1.32.0
+    cachetools~=6.1.0
+    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.33.0,<0.35.0
+    uvicorn[standard]>=0.35.0,<0.36.0
     # OpenCTI
     filigran-sseclient>=1.0.2
     stix2~=3.0.1
@@ -62,7 +62,7 @@ dev =
     isort~=6.0.0
     types-pytz~=2025.2.0.20250326
     pre-commit~=4.2.0
-    pytest-cases~=3.8.0
+    pytest-cases~=3.9.1
     pytest-cov~=6.2.1
     pytest_randomly~=3.16.0
     pytest~=8.4.1