pycti 6.5.9__tar.gz → 6.5.10__tar.gz

{pycti-6.5.9 → pycti-6.5.10}/PKG-INFO

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

{pycti-6.5.9 → pycti-6.5.10}/pycti/__init__.py

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

{pycti-6.5.9 → pycti-6.5.10}/pycti/api/opencti_api_client.py

@@ -280,7 +280,7 @@ class OpenCTIApiClient:
                 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]

{pycti-6.5.9 → pycti-6.5.10}/pycti/api/opencti_api_connector.py

@@ -61,6 +61,9 @@ class OpenCTIApiConnector:
                 connectorsForWorker {
                     id
                     name
+                    connector_user {
+                      api_token
+                    }
                     config {
                         connection {
                             host

{pycti-6.5.9 → pycti-6.5.10}/pycti/entities/opencti_indicator.py

@@ -48,6 +48,7 @@ class Indicator:
         :param list customAttributes: (optional) list of attributes keys to return
         :param bool getAll: (optional) switch to return all entries (be careful to use this without any other filters)
         :param bool withPagination: (optional) switch to use pagination
+        :param bool toStix: (optional) get in STIX
 
         :return: List of Indicators
         :rtype: list
@@ -63,21 +64,26 @@ class Indicator:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
+        to_stix = kwargs.get("toStix", False)
 
         self.opencti.app_logger.info(
             "Listing Indicators with filters", {"filters": json.dumps(filters)}
         )
         query = (
             """
-                query Indicators($filters: FilterGroup, $search: String, $first: Int, $after: ID, $orderBy: IndicatorsOrdering, $orderMode: OrderingMode) {
-                    indicators(filters: $filters, search: $search, first: $first, after: $after, orderBy: $orderBy, orderMode: $orderMode) {
+                query Indicators($filters: FilterGroup, $search: String, $first: Int, $after: ID, $orderBy: IndicatorsOrdering, $orderMode: OrderingMode, $toStix: Boolean) {
+                    indicators(filters: $filters, search: $search, first: $first, after: $after, orderBy: $orderBy, orderMode: $orderMode, toStix: $toStix) {
                         edges {
                             node {
                                 """
             + (
-                custom_attributes
-                if custom_attributes is not None
-                else (self.properties_with_files if with_files else self.properties)
+                "toStix"
+                if to_stix
+                else (
+                    custom_attributes
+                    if custom_attributes is not None
+                    else (self.properties_with_files if with_files else self.properties)
+                )
             )
             + """
                         }
@@ -102,6 +108,7 @@ class Indicator:
                 "after": after,
                 "orderBy": order_by,
                 "orderMode": order_mode,
+                "toStix": to_stix,
             },
         )
         if get_all:

{pycti-6.5.9 → pycti-6.5.10}/pycti/utils/constants.py

@@ -1,6 +1,4 @@
-"""These are the custom STIX properties and observation types used internally by OpenCTI.
-
-"""
+"""These are the custom STIX properties and observation types used internally by OpenCTI."""
 
 from enum import Enum
 

{pycti-6.5.9 → pycti-6.5.10}/pycti.egg-info/PKG-INFO

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