pycti 5.12.13__py3-none-any.whl → 5.12.15__py3-none-any.whl

pycti/entities/opencti_report.py

@@ -7,8 +7,6 @@ import uuid
 from dateutil.parser import parse
 from stix2.canonicalization.Canonicalize import canonicalize
 
-from pycti.entities import LOGGER
-
 
 class Report:
     def __init__(self, opencti):
@@ -490,7 +488,9 @@ class Report:
         if get_all:
             first = 100
 
-        LOGGER.info("Listing Reports with filters %s.", json.dumps(filters))
+        self.opencti.app_logger.info(
+            "Listing Reports with filters", {"filters": json.dumps(filters)}
+        )
         query = (
             """
             query Reports($filters: FilterGroup, $search: String, $first: Int, $after: ID, $orderBy: ReportsOrdering, $orderMode: OrderingMode) {
@@ -534,7 +534,7 @@ class Report:
             final_data = final_data + data
             while result["data"]["reports"]["pageInfo"]["hasNextPage"]:
                 after = result["data"]["reports"]["pageInfo"]["endCursor"]
-                LOGGER.info("Listing Reports after " + after)
+                self.opencti.app_logger.info("Listing Reports", {"after": after})
                 result = self.opencti.query(
                     query,
                     {
@@ -568,7 +568,7 @@ class Report:
         custom_attributes = kwargs.get("customAttributes", None)
         with_files = kwargs.get("withFiles", False)
         if id is not None:
-            LOGGER.info("Reading Report {%s}.", id)
+            self.opencti.app_logger.info("Reading Report", {"id": id})
             query = (
                 """
                 query Report($id: String!) {
@@ -639,9 +639,12 @@ class Report:
             "stixObjectOrStixRelationshipId", None
         )
         if id is not None and stix_object_or_stix_relationship_id is not None:
-            LOGGER.info(
-                "Checking StixObjectOrStixRelationship {%s} in Report {%s}",
-                *(stix_object_or_stix_relationship_id, id),
+            self.opencti.app_logger.info(
+                "Checking StixObjectOrStixRelationship in Report",
+                {
+                    "id": id,
+                    "stixObjectOrStixRelationshipId": stix_object_or_stix_relationship_id,
+                },
             )
             query = """
                 query ReportContainsStixObjectOrStixRelationship($id: String!, $stixObjectOrStixRelationshipId: String!) {
@@ -657,7 +660,7 @@ class Report:
             )
             return result["data"]["reportContainsStixObjectOrStixRelationship"]
         else:
-            LOGGER.error(
+            self.opencti.app_logger.error(
                 "[opencti_report] Missing parameters: id or stixObjectOrStixRelationshipId",
             )
 
@@ -682,6 +685,7 @@ class Report:
         modified = kwargs.get("modified", None)
         name = kwargs.get("name", None)
         description = kwargs.get("description", None)
+        content = kwargs.get("content", None)
         report_types = kwargs.get("report_types", None)
         published = kwargs.get("published", None)
         x_opencti_reliability = kwargs.get("x_opencti_reliability", None)
@@ -690,7 +694,7 @@ class Report:
         update = kwargs.get("update", False)
 
         if name is not None and published is not None:
-            LOGGER.info("Creating Report {%s}.", name)
+            self.opencti.app_logger.info("Creating Report", {"name": name})
             query = """
                 mutation ReportAdd($input: ReportAddInput!) {
                     reportAdd(input: $input) {
@@ -719,6 +723,7 @@ class Report:
                         "modified": modified,
                         "name": name,
                         "description": description,
+                        "content": content,
                         "report_types": report_types,
                         "published": published,
                         "x_opencti_reliability": x_opencti_reliability,
@@ -729,7 +734,7 @@ class Report:
             )
             return self.opencti.process_multiple_fields(result["data"]["reportAdd"])
         else:
-            LOGGER.error(
+            self.opencti.app_logger.error(
                 "[opencti_report] "
                 "Missing parameters: name and description and published and report_class"
             )
@@ -748,9 +753,12 @@ class Report:
             "stixObjectOrStixRelationshipId", None
         )
         if id is not None and stix_object_or_stix_relationship_id is not None:
-            LOGGER.info(
-                "Adding StixObjectOrStixRelationship {%s} to Report {%s}",
-                *(stix_object_or_stix_relationship_id, id),
+            self.opencti.app_logger.info(
+                "Adding StixObjectOrStixRelationship to Report",
+                {
+                    "id": id,
+                    "stixObjectOrStixRelationshipId": stix_object_or_stix_relationship_id,
+                },
             )
             query = """
                mutation ReportEditRelationAdd($id: ID!, $input: StixRefRelationshipAddInput!) {
@@ -773,7 +781,7 @@ class Report:
             )
             return True
         else:
-            LOGGER.error(
+            self.opencti.app_logger.error(
                 "[opencti_report] Missing parameters: id and stixObjectOrStixRelationshipId",
             )
             return False
@@ -792,9 +800,12 @@ class Report:
             "stixObjectOrStixRelationshipId", None
         )
         if id is not None and stix_object_or_stix_relationship_id is not None:
-            LOGGER.info(
-                "Removing StixObjectOrStixRelationship {%s} to Report {%s}",
-                *(stix_object_or_stix_relationship_id, id),
+            self.opencti.app_logger.info(
+                "Removing StixObjectOrStixRelationship to Report",
+                {
+                    "id": id,
+                    "stixObjectOrStixRelationshipId": stix_object_or_stix_relationship_id,
+                },
             )
             query = """
                mutation ReportEditRelationDelete($id: ID!, $toId: StixRef!, $relationship_type: String!) {
@@ -815,7 +826,7 @@ class Report:
             )
             return True
         else:
-            LOGGER.error(
+            self.opencti.app_logger.error(
                 "[opencti_report] Missing parameters: id and stixObjectOrStixRelationshipId",
             )
             return False
@@ -874,6 +885,9 @@ class Report:
                 )
                 if "description" in stix_object
                 else None,
+                content=self.opencti.stix2.convert_markdown(stix_object["content"])
+                if "content" in stix_object
+                else None,
                 report_types=stix_object["report_types"]
                 if "report_types" in stix_object
                 else None,
@@ -892,4 +906,6 @@ class Report:
                 update=update,
             )
         else:
-            LOGGER.error("[opencti_report] Missing parameters: stixObject")
+            self.opencti.app_logger.error(
+                "[opencti_report] Missing parameters: stixObject"
+            )

pycti/entities/opencti_stix.py

@@ -1,8 +1,3 @@
-# coding: utf-8
-
-from pycti.entities import LOGGER
-
-
 class Stix:
     def __init__(self, opencti):
         self.opencti = opencti
@@ -17,7 +12,7 @@ class Stix:
     def delete(self, **kwargs):
         id = kwargs.get("id", None)
         if id is not None:
-            LOGGER.info("Deleting Stix element {%s}.", id)
+            self.opencti.app_logger.info("Deleting Stix element", {"id": id})
             query = """
                  mutation StixEdit($id: ID!) {
                      stixEdit(id: $id) {
@@ -27,7 +22,7 @@ class Stix:
              """
             self.opencti.query(query, {"id": id})
         else:
-            LOGGER.error("[opencti_stix] Missing parameters: id")
+            self.opencti.app_logger.error("[opencti_stix] Missing parameters: id")
             return None
 
     """
@@ -40,16 +35,11 @@ class Stix:
         """
 
     def merge(self, **kwargs):
-        id = kwargs.get("id", None)
-        stix_objects_ids = kwargs.get("object_ids", None)
+        id = kwargs.get("id")
+        stix_objects_ids = kwargs.get("object_ids")
         if id is not None and stix_objects_ids is not None:
-            self.opencti.log(
-                "info",
-                "Merging Stix object {"
-                + id
-                + "} with {"
-                + ",".join(stix_objects_ids)
-                + "}.",
+            self.opencti.app_logger.info(
+                "Merging Stix object", {"id": id, "sources": ",".join(stix_objects_ids)}
             )
             query = """
                         mutation StixEdit($id: ID!, $stixObjectsIds: [String]!) {
@@ -73,8 +63,7 @@ class Stix:
                 result["data"]["stixEdit"]["merge"]
             )
         else:
-            self.opencti.log(
-                "error",
-                "[opencti_stix] Missing parameters: id and object_ids",
+            self.opencti.app_logger.error(
+                "[opencti_stix] Missing parameters: id and object_ids"
             )
             return None

pycti/entities/opencti_stix_core_object.py

@@ -1,8 +1,6 @@
 # coding: utf-8
 import json
 
-from pycti.entities import LOGGER
-
 
 class StixCoreObject:
     def __init__(self, opencti, file):
@@ -1347,7 +1345,9 @@ class StixCoreObject:
         if get_all:
             first = 100
 
-        LOGGER.info("Listing Stix-Core-Objects with filters %s.", json.dumps(filters))
+        self.opencti.app_logger.info(
+            "Listing Stix-Core-Objects with filters", {"filters": json.dumps(filters)}
+        )
         query = (
             """
                     query StixCoreObjects($types: [String], $filters: FilterGroup, $search: String, $relationship_type: [String], $elementId: [String], $first: Int, $after: ID, $orderBy: StixCoreObjectsOrdering, $orderMode: OrderingMode) {
@@ -1395,7 +1395,9 @@ class StixCoreObject:
             final_data = final_data + data
             while result["data"]["stixCoreObjects"]["pageInfo"]["hasNextPage"]:
                 after = result["data"]["stixCoreObjects"]["pageInfo"]["endCursor"]
-                LOGGER.info("Listing Stix-Core-Objects after " + after)
+                self.opencti.app_logger.info(
+                    "Listing Stix-Core-Objects", {"after": after}
+                )
                 result = self.opencti.query(
                     query,
                     {
@@ -1434,7 +1436,7 @@ class StixCoreObject:
         custom_attributes = kwargs.get("customAttributes", None)
         with_files = kwargs.get("withFiles", False)
         if id is not None:
-            LOGGER.info("Reading Stix-Core-Object {%s}.", id)
+            self.opencti.app_logger.info("Reading Stix-Core-Object", {"id": id})
             query = (
                 """
                         query StixCoreObject($id: String!) {
@@ -1463,12 +1465,14 @@ class StixCoreObject:
             else:
                 return None
         else:
-            LOGGER.error("[opencti_stix_core_object] Missing parameters: id or filters")
+            self.opencti.app_logger.error(
+                "[opencti_stix_core_object] Missing parameters: id or filters"
+            )
             return None
 
     def list_files(self, **kwargs):
         id = kwargs.get("id", None)
-        LOGGER.info("Listing files of Stix-Core-Object {%s}.", id)
+        self.opencti.app_logger.info("Listing files of Stix-Core-Object", {"id": id})
         query = """
                     query StixCoreObject($id: String!) {
                         stixCoreObject(id: $id) {
@@ -1523,7 +1527,9 @@ class StixCoreObject:
     def reports(self, **kwargs):
         id = kwargs.get("id", None)
         if id is not None:
-            LOGGER.info("Getting reports of the Stix-Core-Object {%s}.", id)
+            self.opencti.app_logger.info(
+                "Getting reports of the Stix-Core-Object", {"id": id}
+            )
             query = """
                 query StixCoreObject($id: String!) {
                     stixCoreObject(id: $id) {
@@ -1647,5 +1653,5 @@ class StixCoreObject:
             else:
                 return []
         else:
-            LOGGER.error("Missing parameters: id")
+            self.opencti.app_logger.error("Missing parameters: id")
             return None

pycti/entities/opencti_stix_core_relationship.py

@@ -5,8 +5,6 @@ import uuid
 
 from stix2.canonicalization.Canonicalize import canonicalize
 
-from pycti.entities import LOGGER
-
 
 class StixCoreRelationship:
     def __init__(self, opencti):
@@ -408,11 +406,17 @@ class StixCoreRelationship:
         if get_all:
             first = 100
 
-        LOGGER.info(
-            "Listing stix_core_relationships with {type: %s, element_id: %s, from_id: %s, "
-            "to_id: %s, element_with_target_types: %s, from_types: %s, to_types: %s}",
-            *(relationship_type, element_id, from_id),
-            *(to_id, element_with_target_types, from_types, to_types),
+        self.opencti.app_logger.info(
+            "Listing stix_core_relationships",
+            {
+                "relationship_type": relationship_type,
+                "element_id": element_id,
+                "from_id": from_id,
+                "to_id": to_id,
+                "element_with_target_types": element_with_target_types,
+                "from_types": from_types,
+                "to_types": to_types,
+            },
         )
         query = (
             """
@@ -465,7 +469,9 @@ class StixCoreRelationship:
             final_data = final_data + data
             while result["data"]["stixCoreRelationships"]["pageInfo"]["hasNextPage"]:
                 after = result["data"]["stixCoreRelationships"]["pageInfo"]["endCursor"]
-                LOGGER.info("Listing StixCoreRelationships after " + after)
+                self.opencti.app_logger.info(
+                    "Listing StixCoreRelationships", {"after": after}
+                )
                 result = self.opencti.query(
                     query,
                     {
@@ -524,7 +530,7 @@ class StixCoreRelationship:
         stop_time_stop = kwargs.get("stopTimeStop", None)
         custom_attributes = kwargs.get("customAttributes", None)
         if id is not None:
-            LOGGER.info("Reading stix_core_relationship {%s}.", id)
+            self.opencti.app_logger.info("Reading stix_core_relationship", {"id": id})
             query = (
                 """
                     query StixCoreRelationship($id: String!) {
@@ -560,7 +566,7 @@ class StixCoreRelationship:
             else:
                 return None
         else:
-            LOGGER.error("Missing parameters: id or from_id and to_id")
+            self.opencti.app_logger.error("Missing parameters: id or from_id and to_id")
             return None
 
     """
@@ -591,11 +597,13 @@ class StixCoreRelationship:
         granted_refs = kwargs.get("objectOrganization", None)
         update = kwargs.get("update", False)
 
-        LOGGER.info(
-            "Creating stix_core_relationship '%s' {%s, %s}.",
-            relationship_type,
-            from_id,
-            to_id,
+        self.opencti.app_logger.info(
+            "Creating stix_core_relationship",
+            {
+                "relationship_type": relationship_type,
+                "from_id": from_id,
+                "to_id": to_id,
+            },
         )
         query = """
                 mutation StixCoreRelationshipAdd($input: StixCoreRelationshipAddInput!) {
@@ -649,7 +657,7 @@ class StixCoreRelationship:
         id = kwargs.get("id", None)
         input = kwargs.get("input", None)
         if id is not None and input is not None:
-            LOGGER.info("Updating stix_core_relationship {%s}.", id)
+            self.opencti.app_logger.info("Updating stix_core_relationship", {"id": id})
             query = """
                     mutation StixCoreRelationshipEdit($id: ID!, $input: [EditInput]!) {
                         stixCoreRelationshipEdit(id: $id) {
@@ -672,7 +680,7 @@ class StixCoreRelationship:
                 result["data"]["stixCoreRelationshipEdit"]["fieldPatch"]
             )
         else:
-            LOGGER.error(
+            self.opencti.app_logger.error(
                 "[opencti_stix_core_relationship] Missing parameters: id and key and value",
             )
             return None
@@ -687,7 +695,7 @@ class StixCoreRelationship:
     def delete(self, **kwargs):
         id = kwargs.get("id", None)
         if id is not None:
-            LOGGER.info("Deleting stix_core_relationship {%s}.", id)
+            self.opencti.app_logger.info("Deleting stix_core_relationship", {"id": id})
             query = """
                 mutation StixCoreRelationshipEdit($id: ID!) {
                     stixCoreRelationshipEdit(id: $id) {
@@ -697,7 +705,9 @@ class StixCoreRelationship:
             """
             self.opencti.query(query, {"id": id})
         else:
-            LOGGER.error("[opencti_stix_core_relationship] Missing parameters: id")
+            self.opencti.app_logger.error(
+                "[opencti_stix_core_relationship] Missing parameters: id"
+            )
             return None
 
     """
@@ -734,14 +744,16 @@ class StixCoreRelationship:
                 id=id, customAttributes=custom_attributes
             )
             if stix_core_relationship is None:
-                LOGGER.error("Cannot add Marking-Definition, entity not found")
+                self.opencti.app_logger.error(
+                    "Cannot add Marking-Definition, entity not found"
+                )
                 return False
             if marking_definition_id in stix_core_relationship["objectMarkingIds"]:
                 return True
             else:
-                LOGGER.info(
-                    "Adding Marking-Definition {%s} to Stix-Domain-Object {%s}",
-                    *(marking_definition_id, id),
+                self.opencti.app_logger.info(
+                    "Adding Marking-Definition to Stix-Domain-Object",
+                    {"id": id, "marking_definition_id": marking_definition_id},
                 )
                 query = """
                    mutation StixCoreRelationshipAddRelation($id: ID!, $input: StixRefRelationshipAddInput!) {
@@ -764,7 +776,9 @@ class StixCoreRelationship:
                 )
                 return True
         else:
-            LOGGER.error("Missing parameters: id and marking_definition_id")
+            self.opencti.app_logger.error(
+                "Missing parameters: id and marking_definition_id"
+            )
             return False
 
     """
@@ -779,9 +793,9 @@ class StixCoreRelationship:
         id = kwargs.get("id", None)
         marking_definition_id = kwargs.get("marking_definition_id", None)
         if id is not None and marking_definition_id is not None:
-            LOGGER.info(
-                "Removing Marking-Definition {%s} from stix_core_relationship {%s}",
-                *(marking_definition_id, id),
+            self.opencti.app_logger.info(
+                "Removing Marking-Definition from stix_core_relationship",
+                {"id": id, "marking_definition_id": marking_definition_id},
             )
             query = """
                mutation StixCoreRelationshipRemoveRelation($id: ID!, $toId: StixRef!, $relationship_type: String!) {
@@ -802,7 +816,7 @@ class StixCoreRelationship:
             )
             return True
         else:
-            LOGGER.error("Missing parameters: id and label_id")
+            self.opencti.app_logger.error("Missing parameters: id and label_id")
             return False
 
     """
@@ -831,8 +845,9 @@ class StixCoreRelationship:
                 label = self.opencti.label.create(value=label_name)
                 label_id = label["id"]
         if id is not None and label_id is not None:
-            LOGGER.info(
-                "Adding label {%s} to stix-core-relationship {%s}", label_id, id
+            self.opencti.app_logger.info(
+                "Adding label to stix-core-relationship",
+                {"label_id": label_id, "id": id},
             )
             query = """
                mutation StixCoreRelationshipAddRelation($id: ID!, $input: StixRefRelationshipAddInput!) {
@@ -855,7 +870,7 @@ class StixCoreRelationship:
             )
             return True
         else:
-            LOGGER.error("Missing parameters: id and label_id")
+            self.opencti.app_logger.error("Missing parameters: id and label_id")
             return False
 
     """
@@ -870,9 +885,9 @@ class StixCoreRelationship:
         id = kwargs.get("id", None)
         external_reference_id = kwargs.get("external_reference_id", None)
         if id is not None and external_reference_id is not None:
-            LOGGER.info(
-                "Adding External-Reference {%s} to stix-core-relationship {%s}",
-                *(external_reference_id, id),
+            self.opencti.app_logger.info(
+                "Adding External-Reference to stix-core-relationship",
+                {"external_reference_id": external_reference_id, "id": id},
             )
             query = """
                mutation StixCoreRelationshipEditRelationAdd($id: ID!, $input: StixRefRelationshipAddInput!) {
@@ -895,7 +910,9 @@ class StixCoreRelationship:
             )
             return True
         else:
-            LOGGER.error("Missing parameters: id and external_reference_id")
+            self.opencti.app_logger.error(
+                "Missing parameters: id and external_reference_id"
+            )
             return False
 
     """
@@ -910,9 +927,9 @@ class StixCoreRelationship:
         id = kwargs.get("id", None)
         external_reference_id = kwargs.get("external_reference_id", None)
         if id is not None and external_reference_id is not None:
-            LOGGER.info(
-                "Removing External-Reference {%s} from stix_core_relationship {%s}",
-                *(external_reference_id, id),
+            self.opencti.app_logger.info(
+                "Removing External-Reference from stix_core_relationship",
+                {"external_reference_id": external_reference_id, "id": id},
             )
             query = """
                mutation StixCoreRelationshipRemoveRelation($id: ID!, $toId: StixRef!, $relationship_type: String!) {
@@ -933,7 +950,7 @@ class StixCoreRelationship:
             )
             return True
         else:
-            LOGGER.error("Missing parameters: id and label_id")
+            self.opencti.app_logger.error("Missing parameters: id and label_id")
             return False
 
     """
@@ -948,9 +965,9 @@ class StixCoreRelationship:
         id = kwargs.get("id", None)
         kill_chain_phase_id = kwargs.get("kill_chain_phase_id", None)
         if id is not None and kill_chain_phase_id is not None:
-            LOGGER.info(
-                "Adding Kill-Chain-Phase {%s} to stix-core-relationship {%s}",
-                *(kill_chain_phase_id, id),
+            self.opencti.app_logger.info(
+                "Adding Kill-Chain-Phase to stix-core-relationship",
+                {"kill_chain_phase_id": kill_chain_phase_id, "id": id},
             )
             query = """
                mutation StixCoreRelationshipAddRelation($id: ID!, $input: StixRefRelationshipAddInput!) {
@@ -973,7 +990,7 @@ class StixCoreRelationship:
             )
             return True
         else:
-            LOGGER.error(
+            self.opencti.app_logger.error(
                 "[opencti_stix_core_relationship] Missing parameters: id and kill_chain_phase_id",
             )
             return False
@@ -990,9 +1007,9 @@ class StixCoreRelationship:
         id = kwargs.get("id", None)
         kill_chain_phase_id = kwargs.get("kill_chain_phase_id", None)
         if id is not None and kill_chain_phase_id is not None:
-            LOGGER.info(
-                "Removing Kill-Chain-Phase {%s} from stix_core_relationship {%s}",
-                *(kill_chain_phase_id, id),
+            self.opencti.app_logger.info(
+                "Removing Kill-Chain-Phase from stix_core_relationship",
+                {"kill_chain_phase_id": kill_chain_phase_id, "id": id},
             )
             query = """
                mutation StixCoreRelationshipRemoveRelation($id: ID!, $toId: StixRef!, $relationship_type: String!) {
@@ -1013,7 +1030,7 @@ class StixCoreRelationship:
             )
             return True
         else:
-            LOGGER.error(
+            self.opencti.app_loggererror(
                 "[stix_core_relationship] Missing parameters: id and kill_chain_phase_id"
             )
             return False
@@ -1030,9 +1047,9 @@ class StixCoreRelationship:
         id = kwargs.get("id", None)
         identity_id = kwargs.get("identity_id", None)
         if id is not None:
-            LOGGER.info(
-                "Updating author of stix_core_relationship {%s} with Identity {%s}",
-                *(id, identity_id),
+            self.opencti.app_logger.info(
+                "Updating author of stix_core_relationship with Identity",
+                {"id": id, "identity_id": identity_id},
             )
             custom_attributes = """
                 id
@@ -1097,7 +1114,7 @@ class StixCoreRelationship:
                 }
                 self.opencti.query(query, variables)
         else:
-            LOGGER.error("Missing parameters: id")
+            self.opencti.app_logger.error("Missing parameters: id")
             return False
 
     """
@@ -1171,6 +1188,6 @@ class StixCoreRelationship:
                 update=update,
             )
         else:
-            LOGGER.error(
+            self.opencti.app_logger.error(
                 "[opencti_stix_core_relationship] Missing parameters: stixObject"
             )