Merge branch 'master' into release/current

Author: SouadHadjiat

.drone.yml

@@ -57,9 +57,9 @@ steps:
 
 services:
   - name: redis
-    image: redis:7.4.2
+    image: redis:7.4.3
   - name: elastic
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.18.0
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.18.1
     environment:
       discovery.type: single-node
       xpack.security.enabled: false
@@ -71,7 +71,7 @@ services:
       MINIO_ROOT_PASSWORD: ChangeMe
     command: [ server, /data ]
   - name: rabbitmq
-    image: rabbitmq:4.0-management
+    image: rabbitmq:4.1-management
   - name: opencti
     image: nikolaik/python-nodejs:python3.10-nodejs18-alpine
     environment:

docs/requirements.txt

@@ -1,4 +1,4 @@
 autoapi==2.0.1
 sphinx==8.2.3
-sphinx-autodoc-typehints==3.1.0
+sphinx-autodoc-typehints==3.2.0
 sphinx_rtd_theme==3.0.2

pycti/__init__.py

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

pycti/api/opencti_api_client.py

@@ -266,13 +266,15 @@ def set_retry_number(self, retry_number):
             "" if retry_number is None else str(retry_number)
         )
 
-    def query(self, query, variables=None):
+    def query(self, query, variables=None, disable_impersonate=False):
         """submit a query to the OpenCTI GraphQL API
 
         :param query: GraphQL query string
         :type query: str
         :param variables: GraphQL query variables, defaults to {}
         :type variables: dict, optional
+        :param disable_impersonate: removes impersonate header if set to True, defaults to False
+        :type disable_impersonate: bool, optional
         :return: returns the response json content
         :rtype: Any
         """
@@ -297,6 +299,9 @@ def query(self, query, variables=None):
             else:
                 query_var[key] = val
 
+        query_headers = self.request_headers.copy()
+        if disable_impersonate and "opencti-applicant-id" in query_headers:
+            del query_headers["opencti-applicant-id"]
         # If yes, transform variable (file to null) and create multipart query
         if len(files_vars) > 0:
             multipart_data = {
@@ -363,7 +368,7 @@ def query(self, query, variables=None):
                 self.api_url,
                 data=multipart_data,
                 files=multipart_files,
-                headers=self.request_headers,
+                headers=query_headers,
                 verify=self.ssl_verify,
                 cert=self.cert,
                 proxies=self.proxies,
@@ -374,7 +379,7 @@ def query(self, query, variables=None):
             r = self.session.post(
                 self.api_url,
                 json={"query": query, "variables": variables},
-                headers=self.request_headers,
+                headers=query_headers,
                 verify=self.ssl_verify,
                 cert=self.cert,
                 proxies=self.proxies,

pycti/api/opencti_api_work.py

@@ -20,7 +20,7 @@ def to_received(self, work_id: str, message: str):
                     }
                 }
                """
-            self.api.query(query, {"id": work_id, "message": message})
+            self.api.query(query, {"id": work_id, "message": message}, True)
 
     def to_processed(self, work_id: str, message: str, in_error: bool = False):
         if self.api.bundle_send_to_queue:
@@ -35,7 +35,7 @@ def to_processed(self, work_id: str, message: str, in_error: bool = False):
                 }
                """
             self.api.query(
-                query, {"id": work_id, "message": message, "inError": in_error}
+                query, {"id": work_id, "message": message, "inError": in_error}, True
             )
 
     def ping(self, work_id: str):
@@ -60,7 +60,7 @@ def report_expectation(self, work_id: str, error):
                 }
                """
             try:
-                self.api.query(query, {"id": work_id, "error": error})
+                self.api.query(query, {"id": work_id, "error": error}, True)
             except:
                 self.api.app_logger.error("Cannot report expectation")
 
@@ -78,7 +78,9 @@ def add_expectations(self, work_id: str, expectations: int):
                 }
                """
             try:
-                self.api.query(query, {"id": work_id, "expectations": expectations})
+                self.api.query(
+                    query, {"id": work_id, "expectations": expectations}, True
+                )
             except:
                 self.api.app_logger.error("Cannot report expectation")
 
@@ -96,7 +98,9 @@ def add_draft_context(self, work_id: str, draft_context: str):
                 }
                """
             try:
-                self.api.query(query, {"id": work_id, "draftContext": draft_context})
+                self.api.query(
+                    query, {"id": work_id, "draftContext": draft_context}, True
+                )
             except:
                 self.api.app_logger.error("Cannot report draft context")
 
@@ -111,7 +115,9 @@ def initiate_work(self, connector_id: str, friendly_name: str) -> str:
                 }
                """
             work = self.api.query(
-                query, {"connectorId": connector_id, "friendlyName": friendly_name}
+                query,
+                {"connectorId": connector_id, "friendlyName": friendly_name},
+                True,
             )
             return work["data"]["workAdd"]["id"]
 
@@ -122,10 +128,7 @@ def delete_work(self, work_id: str):
                 delete
             }
         }"""
-        work = self.api.query(
-            query,
-            {"workId": work_id},
-        )
+        work = self.api.query(query, {"workId": work_id}, True)
         return work["data"]
 
     def wait_for_work_to_finish(self, work_id: str):
@@ -179,10 +182,7 @@ def get_work(self, work_id: str) -> Dict:
             }
         }
         """
-        result = self.api.query(
-            query,
-            {"id": work_id},
-        )
+        result = self.api.query(query, {"id": work_id}, True)
         return result["data"]["work"]
 
     def get_connector_works(self, connector_id: str) -> List[Dict]:
@@ -243,6 +243,7 @@ def get_connector_works(self, connector_id: str) -> List[Dict]:
                     "filterGroups": [],
                 },
             },
+            True,
         )
         result = result["data"]["works"]["edges"]
         return_value = []

setup.cfg

@@ -70,5 +70,5 @@ dev =
     wheel~=0.45.1
 doc =
     autoapi~=2.0.1
-    sphinx-autodoc-typehints~=3.1.0
+    sphinx-autodoc-typehints~=3.2.0
     sphinx-rtd-theme~=3.0.2