pycti 6.4.7__tar.gz → 6.4.9__tar.gz

{pycti-6.4.7 → pycti-6.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycti
-Version: 6.4.7
+Version: 6.4.9
 Summary: Python API client for OpenCTI.
 Home-page: https://github.com/OpenCTI-Platform/client-python
 Author: Filigran

{pycti-6.4.7 → pycti-6.4.9}/pycti/__init__.py

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

{pycti-6.4.7 → pycti-6.4.9}/pycti/api/opencti_api_client.py

@@ -224,8 +224,11 @@ class OpenCTIApiClient:
     def set_previous_standard_header(self, previous_standard):
         self.request_headers["previous-standard"] = previous_standard
 
-    def get_request_headers(self):
-        return self.request_headers
+    def get_request_headers(self, hide_token=True):
+        request_headers_copy = self.request_headers.copy()
+        if hide_token and "Authorization" in request_headers_copy:
+            request_headers_copy["Authorization"] = "*****"
+        return request_headers_copy
 
     def set_retry_number(self, retry_number):
         self.request_headers["opencti-retry-number"] = (

{pycti-6.4.7 → pycti-6.4.9}/pycti/entities/opencti_indicator.py

@@ -63,8 +63,6 @@ class Indicator:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Indicators with filters", {"filters": json.dumps(filters)}

{pycti-6.4.7 → pycti-6.4.9}/pycti/entities/opencti_marking_definition.py

@@ -25,8 +25,21 @@ class MarkingDefinition:
         """
 
     @staticmethod
-    def generate_id(definition, definition_type):
-        data = {"definition": definition, "definition_type": definition_type}
+    def generate_id(definition_type, definition):
+        # Handle static IDs from OpenCTI
+        if definition_type == "TLP":
+            if definition == "TLP:CLEAR" or definition == "TLP:WHITE":
+                return "marking-definition--613f2e26-407d-48c7-9eca-b8e91df99dc9"
+            if definition == "TLP:GREEN":
+                return "marking-definition--34098fce-860f-48ae-8e50-ebd3cc5e41da"
+            if definition == "TLP:AMBER":
+                return "marking-definition--f88d31f6-486f-44da-b317-01333bde0b82"
+            if definition == "TLP:AMBER+STRICT":
+                return "marking-definition--826578e1-40ad-459f-bc73-ede076f81f37"
+            if definition == "TLP:RED":
+                return "marking-definition--5e57c739-391a-4eb3-b6be-7d15ca92d5ed"
+        # Generate IDs
+        data = {"definition_type": definition_type, "definition": definition}
         data = canonicalize(data, utf8=False)
         id = str(uuid.uuid5(uuid.UUID("00abedb4-aa42-466c-9c01-fed23315a9b7"), data))
         return "marking-definition--" + id
@@ -34,7 +47,7 @@ class MarkingDefinition:
     @staticmethod
     def generate_id_from_data(data):
         return MarkingDefinition.generate_id(
-            data["definition"], data["definition_type"]
+            data["definition_type"], data["definition"]
         )
 
     """

{pycti-6.4.7 → pycti-6.4.9}/pycti/utils/opencti_stix2.py

@@ -1378,7 +1378,7 @@ class OpenCTIStix2:
             created=stix_sighting["created"] if "created" in stix_sighting else None,
             modified=stix_sighting["modified"] if "modified" in stix_sighting else None,
             confidence=(
-                stix_sighting["confidence"] if "confidence" in stix_sighting else 15
+                stix_sighting["confidence"] if "confidence" in stix_sighting else None
             ),
             createdBy=extras["created_by_id"] if "created_by_id" in extras else None,
             objectMarking=(

{pycti-6.4.7 → pycti-6.4.9}/pycti.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycti
-Version: 6.4.7
+Version: 6.4.9
 Summary: Python API client for OpenCTI.
 Home-page: https://github.com/OpenCTI-Platform/client-python
 Author: Filigran