Merge branch 'master' into release/6.6.0

# Conflicts:
#	pycti/connector/opencti_connector_helper.py

Author: JeremyCloarec

.circleci/config.yml

@@ -2,7 +2,6 @@
 version: 2.1
 orbs:
   slack: circleci/[email protected]
-  ms-teams: cloudradar-monitoring/[email protected]
 jobs:
   ensure_formatting:
     docker:
@@ -29,9 +28,6 @@ jobs:
           branch_pattern: master
           event: fail
           template: basic_fail_1
-      - ms-teams/report:
-          only_on_fail: true
-          webhook_url: $MS_TEAMS_WEBHOOK_URL
   linter:
     docker:
       - image: alpine/flake8
@@ -45,9 +41,6 @@ jobs:
           branch_pattern: master
           event: fail
           template: basic_fail_1
-      - ms-teams/report:
-          only_on_fail: true
-          webhook_url: $MS_TEAMS_WEBHOOK_URL
   build:
     working_directory: ~/opencti-client
     docker:
@@ -75,9 +68,6 @@ jobs:
           branch_pattern: master
           event: fail
           template: basic_fail_1
-      - ms-teams/report:
-          only_on_fail: true
-          webhook_url: $MS_TEAMS_WEBHOOK_URL
       - persist_to_workspace:
           root: ~/opencti-client
           paths:
@@ -108,29 +98,20 @@ jobs:
           branch_pattern: master
           event: fail
           template: basic_fail_1
-      - ms-teams/report:
-          only_on_fail: true
-          webhook_url: $MS_TEAMS_WEBHOOK_URL
   notify_rolling:
     docker:
       - image: "cimg/base:stable"
     steps:
       - slack/notify:
           event: pass
           template: basic_success_1
-      - ms-teams/report:
-          only_on_fail: false
-          webhook_url: $MS_TEAMS_WEBHOOK_URL
   notify:
     docker:
       - image: "cimg/base:stable"
     steps:
       - slack/notify:
           event: pass
           template: basic_success_1
-      - ms-teams/report:
-          only_on_fail: false
-          webhook_url: $MS_TEAMS_WEBHOOK_URL
 
 workflows:
   version: 2

docs/requirements.txt

@@ -1,4 +1,4 @@
 autoapi==2.0.1
-sphinx==8.1.3
+sphinx==8.2.3
 sphinx-autodoc-typehints==2.5.0
 sphinx_rtd_theme==3.0.2

pycti/__init__.py

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

pycti/api/opencti_api_client.py

@@ -293,7 +293,7 @@ def query(self, query, variables=None):
                 if is_multiple_files:
                     # [(var_name + "." + i)] if is_multiple_files else
                     for _ in file_var_item["file"]:
-                        file_vars[str(map_index)] = [(var_name + "." + str(map_index))]
+                        file_vars[str(map_index)] = [var_name + "." + str(map_index)]
                         map_index += 1
                 else:
                     file_vars[str(map_index)] = [var_name]
@@ -801,20 +801,21 @@ def send_bundle_to_api(self, **kwargs):
         """
 
         connector_id = kwargs.get("connector_id", None)
+        work_id = kwargs.get("work_id", None)
         bundle = kwargs.get("bundle", None)
 
         if connector_id is not None and bundle is not None:
             self.app_logger.info(
                 "Pushing a bundle to queue through API", {connector_id}
             )
             mutation = """
-                    mutation StixBundlePush($connectorId: String!, $bundle: String!) {
-                        stixBundlePush(connectorId: $connectorId, bundle: $bundle)
+                    mutation StixBundlePush($connectorId: String!, $bundle: String!, $work_id: String) {
+                        stixBundlePush(connectorId: $connectorId, bundle: $bundle, work_id: $work_id)
                     }
                  """
             return self.query(
                 mutation,
-                {"connectorId": connector_id, "bundle": bundle},
+                {"connectorId": connector_id, "bundle": bundle, "work_id": work_id},
             )
         else:
             self.app_logger.error(

pycti/api/opencti_api_connector.py

@@ -61,6 +61,9 @@ def list(self) -> Dict:
                 connectorsForWorker {
                     id
                     name
+                    connector_user {
+                      api_token
+                    }
                     config {
                         connection {
                             host
@@ -72,6 +75,7 @@ def list(self) -> Dict:
                         }
                         listen
                         listen_exchange
+                        listen_callback_uri
                         push
                         push_exchange
                         push_routing

pycti/connector/opencti_connector.py

@@ -43,6 +43,7 @@ def __init__(
         auto: bool,
         only_contextual: bool,
         playbook_compatible: bool,
+        listen_callback_uri=None,
     ):
         self.id = connector_id
         self.name = connector_name
@@ -56,6 +57,7 @@ def __init__(
         self.auto = auto
         self.only_contextual = only_contextual
         self.playbook_compatible = playbook_compatible
+        self.listen_callback_uri = listen_callback_uri
 
     def to_input(self) -> dict:
         """connector input to use in API query
@@ -72,5 +74,6 @@ def to_input(self) -> dict:
                 "auto": self.auto,
                 "only_contextual": self.only_contextual,
                 "playbook_compatible": self.playbook_compatible,
+                "listen_callback_uri": self.listen_callback_uri,
             }
         }