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

pycti/entities/opencti_external_reference.py

@@ -7,8 +7,6 @@ import uuid
 import magic
 from stix2.canonicalization.Canonicalize import canonicalize
 
-from pycti.entities import LOGGER
-
 
 class ExternalReference:
     def __init__(self, opencti, file):
@@ -92,7 +90,9 @@ class ExternalReference:
         if get_all:
             first = 100
 
-        LOGGER.info("Listing External-Reference with filters %s.", json.dumps(filters))
+        self.opencti.app_logger.info(
+            "Listing External-Reference with filters", {"filters": json.dumps(filters)}
+        )
         query = (
             """
             query ExternalReferences($filters: FilterGroup, $first: Int, $after: ID, $orderBy: ExternalReferencesOrdering, $orderMode: OrderingMode) {
@@ -135,7 +135,9 @@ class ExternalReference:
             final_data = final_data + data
             while result["data"]["externalReferences"]["pageInfo"]["hasNextPage"]:
                 after = result["data"]["externalReferences"]["pageInfo"]["endCursor"]
-                LOGGER.info("Listing External-References after " + after)
+                self.opencti.app_logger.info(
+                    "Listing External-References", {"after": after}
+                )
                 result = self.opencti.query(
                     query,
                     {
@@ -168,7 +170,7 @@ class ExternalReference:
         id = kwargs.get("id", None)
         filters = kwargs.get("filters", None)
         if id is not None:
-            LOGGER.info("Reading External-Reference {%s}.", id)
+            self.opencti.app_logger.info("Reading External-Reference", {"id": id})
             query = (
                 """
                 query ExternalReference($id: String!) {
@@ -191,7 +193,7 @@ class ExternalReference:
             else:
                 return None
         else:
-            LOGGER.error(
+            self.opencti.app_logger.error(
                 "[opencti_external_reference] Missing parameters: id or filters"
             )
             return None
@@ -215,7 +217,9 @@ class ExternalReference:
         update = kwargs.get("update", False)
 
         if source_name is not None or url is not None:
-            LOGGER.info("Creating External Reference {%s}.", source_name)
+            self.opencti.app_logger.info(
+                "Creating External Reference", {"source_name": source_name}
+            )
             query = (
                 """
                 mutation ExternalReferenceAdd($input: ExternalReferenceAddInput!) {
@@ -247,7 +251,7 @@ class ExternalReference:
                 result["data"]["externalReferenceAdd"]
             )
         else:
-            LOGGER.error(
+            self.opencti.app_logger.error(
                 "[opencti_external_reference] Missing parameters: source_name and url"
             )
 
@@ -284,8 +288,9 @@ class ExternalReference:
                     mime_type = "application/json"
                 else:
                     mime_type = magic.from_file(file_name, mime=True)
-            LOGGER.info(
-                "Uploading a file {%s} in Stix-Domain-Object {%s}.", final_file_name, id
+            self.opencti.app_logger.info(
+                "Uploading a file in Stix-Domain-Object",
+                {"file": final_file_name, "id": id},
             )
             return self.opencti.query(
                 query,
@@ -298,7 +303,7 @@ class ExternalReference:
                 },
             )
         else:
-            LOGGER.error(
+            self.opencti.app_logger.error(
                 "[opencti_stix_domain_object] Missing parameters: id or file_name"
             )
             return None
@@ -315,7 +320,7 @@ class ExternalReference:
         id = kwargs.get("id", None)
         input = kwargs.get("input", None)
         if id is not None and input is not None:
-            LOGGER.info("Updating External-Reference {%s}.", id)
+            self.opencti.app_logger.info("Updating External-Reference", {"id": id})
             query = """
                     mutation ExternalReferenceEdit($id: ID!, $input: [EditInput]!) {
                         externalReferenceEdit(id: $id) {
@@ -330,13 +335,13 @@ class ExternalReference:
                 result["data"]["externalReferenceEdit"]["fieldPatch"]
             )
         else:
-            LOGGER.error(
+            self.opencti.app_logger.error(
                 "[opencti_external_reference] Missing parameters: id and key and value"
             )
             return None
 
     def delete(self, id):
-        LOGGER.info("Deleting External-Reference " + id + "...")
+        self.opencti.app_logger.info("Deleting External-Reference", {"id": id})
         query = """
              mutation ExternalReferenceEdit($id: ID!) {
                  externalReferenceEdit(id: $id) {
@@ -348,7 +353,7 @@ class ExternalReference:
 
     def list_files(self, **kwargs):
         id = kwargs.get("id", None)
-        LOGGER.info("Listing files of External-Reference { " + id + " }")
+        self.opencti.app_logger.info("Listing files of External-Reference", {"id": id})
         query = """
             query externalReference($id: String!) {
                 externalReference(id: $id) {

pycti/entities/opencti_feedback.py

@@ -4,8 +4,6 @@ import uuid
 from dateutil.parser import parse
 from stix2.canonicalization.Canonicalize import canonicalize
 
-from pycti.entities import LOGGER
-
 
 class Feedback:
     def __init__(self, opencti):
@@ -469,9 +467,8 @@ class Feedback:
         if get_all:
             first = 500
 
-        self.opencti.log(
-            "info",
-            "Listing Feedbacks with filters " + json.dumps(filters) + ".",
+        self.opencti.app_logger.info(
+            "Listing Feedbacks with filters", {"filters": json.dumps(filters)}
         )
         query = (
             """
@@ -516,7 +513,7 @@ class Feedback:
             final_data = final_data + data
             while result["data"]["feedbacks"]["pageInfo"]["hasNextPage"]:
                 after = result["date"]["feedbacks"]["pageInfo"]["endCursor"]
-                self.opencti.log("info", "Listing Feedbacks after " + after)
+                self.opencti.app_logger.info("Listing Feedbacks", {"after": after})
                 result = self.opencti.query(
                     query,
                     {
@@ -550,7 +547,7 @@ class Feedback:
         custom_attributes = kwargs.get("customAttributes", None)
         with_files = kwargs.get("withFiles", False)
         if id is not None:
-            self.opencti.log("info", "Reading Feedback { " + id + "}.")
+            self.opencti.app_logger.info("Reading Feedback", {"id": id})
             query = (
                 """
                     query Feedback($id: String!) {
@@ -623,13 +620,12 @@ class Feedback:
             "stixObjectOrStixRelationshipId", None
         )
         if id is not None and stix_object_or_stix_relationship_id is not None:
-            self.opencti.log(
-                "info",
-                "Checking StixObjectOrStixRelationship {"
-                + stix_object_or_stix_relationship_id
-                + "} in Feedback {"
-                + id
-                + "}",
+            self.opencti.app_logger.info(
+                "Checking StixObjectOrStixRelationship in Feedback",
+                {
+                    "stix_object_or_stix_relationship_id": stix_object_or_stix_relationship_id,
+                    "id": id,
+                },
             )
             query = """
                 query FeedbackContainsStixObjectOrStixRelationship($id: String!, $stixObjectOrStixRelationshipId: String!) {
@@ -645,9 +641,8 @@ class Feedback:
             )
             return result["data"]["feedbackContainsStixObjectOrStixRelationship"]
         else:
-            self.opencti.log(
-                "error",
-                "[opencti_feedback] Missing parameters: id or stixObjectOrStixRelationshipId",
+            self.opencti.app_logger.error(
+                "[opencti_feedback] Missing parameters: id or stixObjectOrStixRelationshipId"
             )
 
     """
@@ -677,7 +672,7 @@ class Feedback:
         update = kwargs.get("update", False)
 
         if name is not None:
-            self.opencti.log("info", "Creating Feedback {" + name + "}.")
+            self.opencti.app_logger.info("Creating Feedback", {"name": name})
             query = """
                 mutation FeedbackAdd($input: FeedbackAddInput!) {
                     feedbackAdd(input: $input) {
@@ -714,13 +709,10 @@ class Feedback:
             )
             return self.opencti.process_multiple_fields(result["data"]["feedbackAdd"])
         else:
-            self.opencti.log(
-                "error",
-                "[opencti_feedback] Missing parameters: name",
-            )
+            self.opencti.app_logger.error("[opencti_feedback] Missing parameters: name")
 
     def update_field(self, **kwargs):
-        LOGGER.info("Updating Feedback {%s}.", json.dumps(kwargs))
+        self.opencti.app_logger.info("Updating Feedback", {"data": json.dumps(kwargs)})
         id = kwargs.get("id", None)
         input = kwargs.get("input", None)
         if id is not None and input is not None:
@@ -742,7 +734,9 @@ class Feedback:
                 result["data"]["stixDomainObjectEdit"]["fieldPatch"]
             )
         else:
-            LOGGER.error("[opencti_feedback] Missing parameters: id and key and value")
+            self.opencti.app_logger.error(
+                "[opencti_feedback] Missing parameters: id and key and value"
+            )
             return None
 
         """
@@ -759,13 +753,12 @@ class Feedback:
             "stixObjectOrStixRelationshipId", None
         )
         if id is not None and stix_object_or_stix_relationship_id is not None:
-            self.opencti.log(
-                "info",
-                "Adding StixObjectOrStixRelationship {"
-                + stix_object_or_stix_relationship_id
-                + "} to Feedback {"
-                + id
-                + "}",
+            self.opencti.app_logger.info(
+                "Adding StixObjectOrStixRelationship in Feedback",
+                {
+                    "stix_object_or_stix_relationship_id": stix_object_or_stix_relationship_id,
+                    "id": id,
+                },
             )
             query = """
                mutation FeedbackEditRelationAdd($id: ID!, $input: StixRefRelationshipAddInput!) {
@@ -788,8 +781,7 @@ class Feedback:
             )
             return True
         else:
-            self.opencti.log(
-                "error",
+            self.opencti.app_logger.error(
                 "[opencti_feedback] Missing parameters: id and stixObjectOrStixRelationshipId",
             )
             return False
@@ -808,13 +800,12 @@ class Feedback:
             "stixObjectOrStixRelationshipId", None
         )
         if id is not None and stix_object_or_stix_relationship_id is not None:
-            self.opencti.log(
-                "info",
-                "Removing StixObjectOrStixRelationship {"
-                + stix_object_or_stix_relationship_id
-                + "} to Feedback {"
-                + id
-                + "}",
+            self.opencti.app_logger.info(
+                "Removing StixObjectOrStixRelationship in Feedback",
+                {
+                    "stix_object_or_stix_relationship_id": stix_object_or_stix_relationship_id,
+                    "id": id,
+                },
             )
             query = """
                mutation FeedbackEditRelationDelete($id: ID!, $toId: StixRef!, $relationship_type: String!) {
@@ -835,8 +826,7 @@ class Feedback:
             )
             return True
         else:
-            self.opencti.log(
-                "error",
+            self.opencti.app_logger.error(
                 "[opencti_feedback] Missing parameters: id and stixObjectOrStixRelationshipId",
             )
             return False
@@ -901,14 +891,14 @@ class Feedback:
                 update=update,
             )
         else:
-            self.opencti.log(
-                "error", "[opencti_feedback] Missing parameters: stixObject"
+            self.opencti.app_logger.error(
+                "[opencti_feedback] Missing parameters: stixObject"
             )
 
     def delete(self, **kwargs):
         id = kwargs.get("id", None)
         if id is not None:
-            LOGGER.info("Deleting Feedback {%s}.", id)
+            self.opencti.app_logger.info("Deleting Feedback", {"id": id})
             query = """
                  mutation FeedbackDelete($id: ID!) {
                      stixDomainObjectEdit(id: $id) {
@@ -918,5 +908,5 @@ class Feedback:
              """
             self.opencti.query(query, {"id": id})
         else:
-            LOGGER.error("[opencti_feedback] Missing parameters: id")
+            self.opencti.app_logger.error("[opencti_feedback] Missing parameters: id")
             return None

pycti/entities/opencti_grouping.py

@@ -5,8 +5,6 @@ import uuid
 
 from stix2.canonicalization.Canonicalize import canonicalize
 
-from pycti.entities import LOGGER
-
 
 class Grouping:
     def __init__(self, opencti):
@@ -443,7 +441,9 @@ class Grouping:
         if get_all:
             first = 100
 
-        LOGGER.info("Listing Groupings with filters %s.", json.dumps(filters))
+        self.opencti.app_logger.info(
+            "Listing Groupings with filters", {"filters": json.dumps(filters)}
+        )
         query = (
             """
             query Groupings($filters: FilterGroup, $search: String, $first: Int, $after: ID, $orderBy: GroupingsOrdering, $orderMode: OrderingMode) {
@@ -487,7 +487,7 @@ class Grouping:
             final_data = final_data + data
             while result["data"]["groupings"]["pageInfo"]["hasNextPage"]:
                 after = result["data"]["groupings"]["pageInfo"]["endCursor"]
-                LOGGER.info("Listing Groupings after " + after)
+                self.opencti.app_logger.info("Listing Groupings", {"after": after})
                 result = self.opencti.query(
                     query,
                     {
@@ -521,7 +521,7 @@ class Grouping:
         custom_attributes = kwargs.get("customAttributes", None)
         with_files = kwargs.get("withFiles", False)
         if id is not None:
-            LOGGER.info("Reading Grouping {%s}.", id)
+            self.opencti.app_logger.info("Reading Grouping", {"id": id})
             query = (
                 """
                 query Grouping($id: String!) {
@@ -591,9 +591,9 @@ class Grouping:
             "stixObjectOrStixRelationshipId", None
         )
         if id is not None and stix_object_or_stix_relationship_id is not None:
-            LOGGER.info(
-                "Checking StixObjectOrStixRelationship {%s} in Grouping {%s}",
-                *(stix_object_or_stix_relationship_id, id),
+            self.opencti.app_logger.info(
+                "Checking StixObjectOrStixRelationship in Grouping",
+                {"id": stix_object_or_stix_relationship_id, "grouping": id},
             )
             query = """
                 query GroupingContainsStixObjectOrStixRelationship($id: String!, $stixObjectOrStixRelationshipId: String!) {
@@ -609,7 +609,7 @@ class Grouping:
             )
             return result["data"]["groupingContainsStixObjectOrStixRelationship"]
         else:
-            LOGGER.error(
+            self.opencti.app_logger.error(
                 "[opencti_grouping] Missing parameters: id or stixObjectOrStixRelationshipId"
             )
 
@@ -641,7 +641,7 @@ class Grouping:
         update = kwargs.get("update", False)
 
         if name is not None and context is not None:
-            LOGGER.info("Creating Grouping {%s}.", name)
+            self.opencti.app_logger.info("Creating Grouping", {"name": name})
             query = """
                 mutation GroupingAdd($input: GroupingAddInput!) {
                     groupingAdd(input: $input) {
@@ -679,7 +679,7 @@ class Grouping:
             )
             return self.opencti.process_multiple_fields(result["data"]["groupingAdd"])
         else:
-            LOGGER.error(
+            self.opencti.app_logger.error(
                 "[opencti_grouping] Missing parameters: name and description and context"
             )
 
@@ -697,9 +697,9 @@ class Grouping:
             "stixObjectOrStixRelationshipId", None
         )
         if id is not None and stix_object_or_stix_relationship_id is not None:
-            LOGGER.info(
-                "Adding StixObjectOrStixRelationship {%s} to Grouping {%s}",
-                *(stix_object_or_stix_relationship_id, id),
+            self.opencti.app_logger.info(
+                "Adding StixObjectOrStixRelationship to Grouping",
+                {"id": stix_object_or_stix_relationship_id, "grouping": id},
             )
             query = """
                mutation GroupingEditRelationAdd($id: ID!, $input: StixRefRelationshipAddInput!) {
@@ -720,7 +720,7 @@ class Grouping:
             )
             return True
         else:
-            LOGGER.error(
+            self.opencti.app_logger.error(
                 "[opencti_grouping] Missing parameters: id and stixObjectOrStixRelationshipId",
             )
             return False
@@ -739,9 +739,9 @@ class Grouping:
             "stixObjectOrStixRelationshipId", None
         )
         if id is not None and stix_object_or_stix_relationship_id is not None:
-            LOGGER.info(
-                "Removing StixObjectOrStixRelationship {%s} to {%s}",
-                *(stix_object_or_stix_relationship_id, Grouping),
+            self.opencti.app_logger.info(
+                "Removing StixObjectOrStixRelationship to Grouping",
+                {"id": stix_object_or_stix_relationship_id, "grouping": id},
             )
             query = """
                mutation GroupingEditRelationDelete($id: ID!, $toId: StixRef!, $relationship_type: String!) {
@@ -760,7 +760,7 @@ class Grouping:
             )
             return True
         else:
-            LOGGER.error(
+            self.opencti.app_logger.error(
                 "[opencti_grouping] Missing parameters: id and stixObjectOrStixRelationshipId",
             )
             return False
@@ -830,4 +830,6 @@ class Grouping:
                 update=update,
             )
         else:
-            LOGGER.error("[opencti_grouping] Missing parameters: stixObject")
+            self.opencti.app_logger.error(
+                "[opencti_grouping] Missing parameters: stixObject"
+            )

pycti/entities/opencti_identity.py

@@ -5,7 +5,6 @@ import uuid
 
 from stix2.canonicalization.Canonicalize import canonicalize
 
-from pycti.entities import LOGGER
 from pycti.utils.constants import IdentityTypes
 
 
@@ -273,7 +272,9 @@ class Identity:
         if get_all:
             first = 500
 
-        LOGGER.info("Listing Identities with filters %s.", json.dumps(filters))
+        self.opencti.app_logger.info(
+            "Listing Identities with filters", {"filters": json.dumps(filters)}
+        )
         query = (
             """
             query Identities($types: [String], $filters: FilterGroup, $search: String, $first: Int, $after: ID, $orderBy: IdentitiesOrdering, $orderMode: OrderingMode) {
@@ -318,7 +319,7 @@ class Identity:
             final_data = final_data + data
             while result["data"]["identities"]["pageInfo"]["hasNextPage"]:
                 after = result["data"]["identities"]["pageInfo"]["endCursor"]
-                LOGGER.info("Listing Identities after " + after)
+                self.opencti.app_logger.info("Listing Identities", {"after": after})
                 result = self.opencti.query(
                     query,
                     {
@@ -352,7 +353,7 @@ class Identity:
         custom_attributes = kwargs.get("customAttributes", None)
         with_files = kwargs.get("withFiles", False)
         if id is not None:
-            LOGGER.info("Reading Identity {%s}.", id)
+            self.opencti.app_logger.info("Reading Identity", {"id": id})
             query = (
                 """
                 query Identity($id: String!) {
@@ -377,7 +378,9 @@ class Identity:
             else:
                 return None
         else:
-            LOGGER.error("[opencti_identity] Missing parameters: id or filters")
+            self.opencti.app_logger.error(
+                "[opencti_identity] Missing parameters: id or filters"
+            )
             return None
 
     """
@@ -413,7 +416,7 @@ class Identity:
         update = kwargs.get("update", False)
 
         if type is not None and name is not None:
-            LOGGER.info("Creating Identity {%s}.", name)
+            self.opencti.app_logger.info("Creating Identity", {"name": name})
             input_variables = {
                 "stix_id": stix_id,
                 "createdBy": created_by,
@@ -503,7 +506,9 @@ class Identity:
                 result["data"][result_data_field]
             )
         else:
-            LOGGER.error("Missing parameters: type, name and description")
+            self.opencti.app_logger.error(
+                "Missing parameters: type, name and description"
+            )
 
     """
         Import an Identity object from a STIX2 object
@@ -622,4 +627,6 @@ class Identity:
                 update=update,
             )
         else:
-            LOGGER.error("[opencti_identity] Missing parameters: stixObject")
+            self.opencti.app_logger.error(
+                "[opencti_identity] Missing parameters: stixObject"
+            )

pycti/entities/opencti_incident.py

@@ -6,8 +6,6 @@ import uuid
 
 from stix2.canonicalization.Canonicalize import canonicalize
 
-from pycti.entities import LOGGER
-
 
 class Incident:
     def __init__(self, opencti):
@@ -265,7 +263,9 @@ class Incident:
         if get_all:
             first = 100
 
-        LOGGER.info("Listing Incidents with filters %s.", json.dumps(filters))
+        self.opencti.app_logger.info(
+            "Listing Incidents with filters", {"filters": json.dumps(filters)}
+        )
         query = (
             """
             query Incidents($filters: FilterGroup, $search: String, $first: Int, $after: ID, $orderBy: IncidentsOrdering, $orderMode: OrderingMode) {
@@ -309,7 +309,7 @@ class Incident:
             final_data = final_data + data
             while result["data"]["incidents"]["pageInfo"]["hasNextPage"]:
                 after = result["data"]["incidents"]["pageInfo"]["endCursor"]
-                LOGGER.info("Listing Incidents after " + after)
+                self.opencti.app_logger.info("Listing Incidents", {"after": after})
                 result = self.opencti.query(
                     query,
                     {
@@ -343,7 +343,7 @@ class Incident:
         custom_attributes = kwargs.get("customAttributes", None)
         with_files = kwargs.get("withFiles", False)
         if id is not None:
-            LOGGER.info("Reading Incident {%s}.", id)
+            self.opencti.app_logger.info("Reading Incident", {"id": id})
             query = (
                 """
                 query Incident($id: String!) {
@@ -368,7 +368,9 @@ class Incident:
             else:
                 return None
         else:
-            LOGGER.error("[opencti_incident] Missing parameters: id or filters")
+            self.opencti.app_logger.error(
+                "[opencti_incident] Missing parameters: id or filters"
+            )
             return None
 
     """
@@ -404,7 +406,7 @@ class Incident:
         update = kwargs.get("update", False)
 
         if name is not None:
-            LOGGER.info("Creating Incident {%s}.", name)
+            self.opencti.app_logger.info("Creating Incident", {"name": name})
             query = """
                 mutation IncidentAdd($input: IncidentAddInput!) {
                     incidentAdd(input: $input) {
@@ -447,7 +449,7 @@ class Incident:
             )
             return self.opencti.process_multiple_fields(result["data"]["incidentAdd"])
         else:
-            LOGGER.error("Missing parameters: name and description")
+            self.opencti.app_logger.error("Missing parameters: name and description")
 
     """
         Import a Incident object from a STIX2 object
@@ -525,4 +527,6 @@ class Incident:
                 update=update,
             )
         else:
-            LOGGER.error("[opencti_incident] Missing parameters: stixObject")
+            self.opencti.app_logger.error(
+                "[opencti_incident] Missing parameters: stixObject"
+            )