Merge branch 'master' into release/current

Author: aHenryJard

.drone.yml

@@ -3,6 +3,11 @@ kind: pipeline
 name: client-python-tests
 
 steps:
+  - name: Runner information
+    image: alpine:3.19
+    commands:
+    - echo DRONE_STAGE_MACHINE ${DRONE_STAGE_MACHINE}
+
   - name: sleep-for-opencti
     image: python:3.11
     commands:
@@ -77,6 +82,8 @@ services:
     environment:
       APP__ADMIN__PASSWORD: admin
       APP__ADMIN__TOKEN: bfa014e0-e02e-4aa6-a42b-603b19dcf159
+      APP__ENTERPRISE_EDITION_LICENSE:
+        from_secret: ee_license
       REDIS__HOSTNAME: redis
       REDIS__NAMESPACE: raw-start
       ELASTICSEARCH__URL: http://elastic:9200

pycti/__init__.py

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

pycti/connector/opencti_connector_helper.py

@@ -2001,6 +2001,7 @@ def send_stix2_bundle(self, bundle: str, **kwargs) -> list:
                 self.api.send_bundle_to_api(
                     connector_id=self.connector_id, bundle=bundle, work_id=work_id
                 )
+                self.metric.inc("bundle_send")
             else:
                 raise ValueError(
                     f"{self.queue_protocol}: this queue protocol is not supported"

pycti/entities/opencti_case_rfi.py

@@ -546,7 +546,7 @@ def list(self, **kwargs):
             data = self.opencti.process_multiple(result["data"]["caseRfis"])
             final_data = final_data + data
             while result["data"]["caseRfis"]["pageInfo"]["hasNextPage"]:
-                after = result["date"]["caseRfis"]["pageInfo"]["endCursor"]
+                after = result["data"]["caseRfis"]["pageInfo"]["endCursor"]
                 self.opencti.app_logger.info("Listing Case Rfis", {"after": after})
                 result = self.opencti.query(
                     query,

pycti/entities/opencti_case_rft.py

@@ -545,7 +545,7 @@ def list(self, **kwargs):
             data = self.opencti.process_multiple(result["data"]["caseRfts"])
             final_data = final_data + data
             while result["data"]["caseRfts"]["pageInfo"]["hasNextPage"]:
-                after = result["date"]["caseRfts"]["pageInfo"]["endCursor"]
+                after = result["data"]["caseRfts"]["pageInfo"]["endCursor"]
                 self.opencti.app_logger.info("Listing Case Rfts", {"after": after})
                 result = self.opencti.query(
                     query,

pycti/entities/opencti_feedback.py

@@ -506,7 +506,7 @@ def list(self, **kwargs):
             data = self.opencti.process_multiple(result["data"]["feedbacks"])
             final_data = final_data + data
             while result["data"]["feedbacks"]["pageInfo"]["hasNextPage"]:
-                after = result["date"]["feedbacks"]["pageInfo"]["endCursor"]
+                after = result["data"]["feedbacks"]["pageInfo"]["endCursor"]
                 self.opencti.app_logger.info("Listing Feedbacks", {"after": after})
                 result = self.opencti.query(
                     query,

pycti/entities/opencti_task.py

@@ -307,7 +307,7 @@ def list(self, **kwargs):
             data = self.opencti.process_multiple(result["data"]["tasks"])
             final_data = final_data + data
             while result["data"]["tasks"]["pageInfo"]["hasNextPage"]:
-                after = result["date"]["tasks"]["pageInfo"]["endCursor"]
+                after = result["data"]["tasks"]["pageInfo"]["endCursor"]
                 self.opencti.app_logger.info("Listing Tasks", {"after": after})
                 result = self.opencti.query(
                     query,

pycti/utils/opencti_stix2.py

@@ -308,7 +308,7 @@ def extract_embedded_relationships(
         object_marking_ids = (
             stix_object["object_marking_refs"]
             if "object_marking_refs" in stix_object
-            else []
+            else None
         )
 
         # Open vocabularies