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

pycti/entities/opencti_attack_pattern.py

@@ -5,8 +5,6 @@ import uuid
 
 from stix2.canonicalization.Canonicalize import canonicalize
 
-from pycti.entities import LOGGER
-
 
 class AttackPattern:
     def __init__(self, opencti):
@@ -289,7 +287,9 @@ class AttackPattern:
         if get_all:
             first = 500
 
-        LOGGER.info("Listing Attack-Patterns with filters %s.", json.dumps(filters))
+        self.opencti.app_logger.info(
+            "Listing Attack-Patterns with filters", {"filters": json.dumps(filters)}
+        )
         query = (
             """
             query AttackPatterns($filters: FilterGroup, $search: String, $first: Int, $after: ID, $orderBy: AttackPatternsOrdering, $orderMode: OrderingMode) {
@@ -333,7 +333,9 @@ class AttackPattern:
             final_data = final_data + data
             while result["data"]["attackPatterns"]["pageInfo"]["hasNextPage"]:
                 after = result["data"]["attackPatterns"]["pageInfo"]["endCursor"]
-                LOGGER.info("Listing Attack-Patterns after " + after)
+                self.opencti.app_logger.info(
+                    "Listing Attack-Patterns", {"after": after}
+                )
                 result = self.opencti.query(
                     query,
                     {
@@ -367,7 +369,7 @@ class AttackPattern:
         custom_attributes = kwargs.get("customAttributes", None)
         with_files = kwargs.get("withFiles", False)
         if id is not None:
-            LOGGER.info("Reading Attack-Pattern {%s}.", id)
+            self.opencti.app_logger.info("Reading Attack-Pattern", {"id": id})
             query = (
                 """
                 query AttackPattern($id: String!) {
@@ -392,7 +394,9 @@ class AttackPattern:
             else:
                 return None
         else:
-            LOGGER.error("[opencti_attack_pattern] Missing parameters: id or filters")
+            self.opencti.app_logger.error(
+                "[opencti_attack_pattern] Missing parameters: id or filters"
+            )
             return None
 
     """
@@ -426,7 +430,7 @@ class AttackPattern:
         update = kwargs.get("update", False)
 
         if name is not None:
-            LOGGER.info("Creating Attack-Pattern {%s}.", name)
+            self.opencti.app_logger.info("Creating Attack-Pattern", {"name": name})
             query = """
                 mutation AttackPatternAdd($input: AttackPatternAddInput!) {
                     attackPatternAdd(input: $input) {
@@ -469,7 +473,7 @@ class AttackPattern:
                 result["data"]["attackPatternAdd"]
             )
         else:
-            LOGGER.error(
+            self.opencti.app_logger.error(
                 "[opencti_attack_pattern] Missing parameters: name and description"
             )
 
@@ -598,12 +602,14 @@ class AttackPattern:
                 update=update,
             )
         else:
-            LOGGER.error("[opencti_attack_pattern] Missing parameters: stixObject")
+            self.opencti.app_logger.error(
+                "[opencti_attack_pattern] Missing parameters: stixObject"
+            )
 
     def delete(self, **kwargs):
         id = kwargs.get("id", None)
         if id is not None:
-            LOGGER.info("Deleting Attack Pattern {%s}.", id)
+            self.opencti.app_logger.info("Deleting Attack Pattern", {"id": id})
             query = """
                  mutation AttackPatternEdit($id: ID!) {
                      attackPatternEdit(id: $id) {
@@ -613,5 +619,5 @@ class AttackPattern:
              """
             self.opencti.query(query, {"id": id})
         else:
-            LOGGER.error("[attack_pattern] Missing parameters: id")
+            self.opencti.app_logger.error("[attack_pattern] Missing parameters: id")
             return None

pycti/entities/opencti_campaign.py

@@ -5,8 +5,6 @@ import uuid
 
 from stix2.canonicalization.Canonicalize import canonicalize
 
-from pycti.entities import LOGGER
-
 
 class Campaign:
     def __init__(self, opencti):
@@ -256,7 +254,9 @@ class Campaign:
         if get_all:
             first = 100
 
-        LOGGER.info("Listing Campaigns with filters %s.", json.dumps(filters))
+        self.opencti.app_logger.info(
+            "Listing Campaigns with filters", {"filters": json.dumps(filters)}
+        )
         query = (
             """
             query Campaigns($filters: FilterGroup, $search: String, $first: Int, $after: ID, $orderBy: CampaignsOrdering, $orderMode: OrderingMode) {
@@ -300,7 +300,7 @@ class Campaign:
             final_data = final_data + data
             while result["data"]["campaigns"]["pageInfo"]["hasNextPage"]:
                 after = result["data"]["campaigns"]["pageInfo"]["endCursor"]
-                LOGGER.info("Listing Campaigns after " + after)
+                self.opencti.app_logger.info("Listing Campaigns", {"after": after})
                 result = self.opencti.query(
                     query,
                     {
@@ -334,7 +334,7 @@ class Campaign:
         custom_attributes = kwargs.get("customAttributes", None)
         with_files = kwargs.get("withFiles", False)
         if id is not None:
-            LOGGER.info("Reading Campaign {%s}.", id)
+            self.opencti.app_logger.info("Reading Campaign", {"id": id})
             query = (
                 """
                 query Campaign($id: String!) {
@@ -359,7 +359,9 @@ class Campaign:
             else:
                 return None
         else:
-            LOGGER.error("[opencti_campaign] Missing parameters: id or filters")
+            self.opencti.app_logger.error(
+                "[opencti_campaign] Missing parameters: id or filters"
+            )
             return None
 
     """
@@ -391,7 +393,7 @@ class Campaign:
         update = kwargs.get("update", False)
 
         if name is not None:
-            LOGGER.info("Creating Campaign {%s}.", name)
+            self.opencti.app_logger.info("Creating Campaign", {"name": name})
             query = """
                 mutation CampaignAdd($input: CampaignAddInput!) {
                     campaignAdd(input: $input) {
@@ -430,7 +432,9 @@ class Campaign:
             )
             return self.opencti.process_multiple_fields(result["data"]["campaignAdd"])
         else:
-            LOGGER.error("[opencti_campaign] Missing parameters: name and description")
+            self.opencti.app_logger.error(
+                "[opencti_campaign] Missing parameters: name and description"
+            )
 
     """
         Import a Campaign object from a STIX2 object
@@ -500,4 +504,6 @@ class Campaign:
                 update=update,
             )
         else:
-            LOGGER.error("[opencti_campaign] Missing parameters: stixObject")
+            self.opencti.app_logger.error(
+                "[opencti_campaign] Missing parameters: stixObject"
+            )

pycti/entities/opencti_case_incident.py

@@ -5,8 +5,6 @@ import uuid
 from dateutil.parser import parse
 from stix2.canonicalization.Canonicalize import canonicalize
 
-from pycti.entities import LOGGER
-
 
 class CaseIncident:
     def __init__(self, opencti):
@@ -499,7 +497,9 @@ class CaseIncident:
         if get_all:
             first = 500
 
-        LOGGER.info("Listing Case Incidents with filters " + json.dumps(filters) + ".")
+        self.opencti.app_logger.info(
+            "Listing Case Incidents with filters", {"filters": json.dumps(filters)}
+        )
         query = (
             """
                 query CaseIncidents($filters: FilterGroup, $search: String, $first: Int, $after: ID, $orderBy: CaseIncidentsOrdering, $orderMode: OrderingMode) {
@@ -543,7 +543,7 @@ class CaseIncident:
             final_data = final_data + data
             while result["data"]["caseIncidents"]["pageInfo"]["hasNextPage"]:
                 after = result["date"]["caseIncidents"]["pageInfo"]["endCursor"]
-                self.opencti.log("info", "Listing Case Incidents after " + after)
+                self.opencti.app_logger.info("Listing Case Incidents", {"after": after})
                 result = self.opencti.query(
                     query,
                     {
@@ -577,7 +577,7 @@ class CaseIncident:
         custom_attributes = kwargs.get("customAttributes", None)
         with_files = kwargs.get("withFiles", False)
         if id is not None:
-            self.opencti.log("info", "Reading Case Incident { " + id + "}.")
+            self.opencti.app_logger.info("Reading Case Incident", {"id": id})
             query = (
                 """
                     query CaseIncident($id: String!) {
@@ -648,13 +648,12 @@ class CaseIncident:
             "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 CaseIncident {"
-                + id
-                + "}",
+            self.opencti.app_logger.info(
+                "Checking StixObjectOrStixRelationship in CaseIncident",
+                {
+                    "stix_object_or_stix_relationship_id": stix_object_or_stix_relationship_id,
+                    "id": id,
+                },
             )
             query = """
                 query CaseIncidentContainsStixObjectOrStixRelationship($id: String!, $stixObjectOrStixRelationshipId: String!) {
@@ -670,9 +669,8 @@ class CaseIncident:
             )
             return result["data"]["caseIncidentContainsStixObjectOrStixRelationship"]
         else:
-            self.opencti.log(
-                "error",
-                "[opencti_caseIncident] Missing parameters: id or stixObjectOrStixRelationshipId",
+            self.opencti.app_logger.error(
+                "[opencti_caseIncident] Missing parameters: id or stixObjectOrStixRelationshipId"
             )
 
     """
@@ -706,7 +704,7 @@ class CaseIncident:
         update = kwargs.get("update", False)
 
         if name is not None:
-            self.opencti.log("info", "Creating Case Incident {" + name + "}.")
+            self.opencti.app_logger.info("Creating Case Incident", {"name": name})
             query = """
                 mutation CaseIncidentAdd($input: CaseIncidentAddInput!) {
                     caseIncidentAdd(input: $input) {
@@ -749,9 +747,8 @@ class CaseIncident:
                 result["data"]["caseIncidentAdd"]
             )
         else:
-            self.opencti.log(
-                "error",
-                "[opencti_caseIncident] Missing parameters: name",
+            self.opencti.app_logger.error(
+                "[opencti_caseIncident] Missing parameters: name"
             )
 
         """
@@ -768,14 +765,14 @@ class CaseIncident:
             "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 CaseIncident {"
-                + id
-                + "}",
+            self.opencti.app_logger.info(
+                "Adding StixObjectOrStixRelationship to CaseIncident",
+                {
+                    "stix_object_or_stix_relationship_id": stix_object_or_stix_relationship_id,
+                    "id": id,
+                },
             )
+
             query = """
                mutation CaseIncidentEditRelationAdd($id: ID!, $input: StixRefRelationshipAddInput!) {
                     stixDomainObjectEdit(id: $id) {
@@ -797,9 +794,8 @@ class CaseIncident:
             )
             return True
         else:
-            self.opencti.log(
-                "error",
-                "[opencti_caseIncident] Missing parameters: id and stixObjectOrStixRelationshipId",
+            self.opencti.app_logger.error(
+                "[opencti_caseIncident] Missing parameters: id and stixObjectOrStixRelationshipId"
             )
             return False
 
@@ -817,13 +813,12 @@ class CaseIncident:
             "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 CaseIncident {"
-                + id
-                + "}",
+            self.opencti.app_logger.info(
+                "Removing StixObjectOrStixRelationship to CaseIncident",
+                {
+                    "stix_object_or_stix_relationship_id": stix_object_or_stix_relationship_id,
+                    "id": id,
+                },
             )
             query = """
                mutation CaseIncidentEditRelationDelete($id: ID!, $toId: StixRef!, $relationship_type: String!) {
@@ -844,9 +839,8 @@ class CaseIncident:
             )
             return True
         else:
-            self.opencti.log(
-                "error",
-                "[opencti_caseIncident] Missing parameters: id and stixObjectOrStixRelationshipId",
+            self.opencti.app_logger.error(
+                "[opencti_caseIncident] Missing parameters: id and stixObjectOrStixRelationshipId"
             )
             return False
 
@@ -930,14 +924,14 @@ class CaseIncident:
                 update=update,
             )
         else:
-            self.opencti.log(
-                "error", "[opencti_caseIncident] Missing parameters: stixObject"
+            self.opencti.app_logger.error(
+                "[opencti_caseIncident] Missing parameters: stixObject"
             )
 
     def delete(self, **kwargs):
         id = kwargs.get("id", None)
         if id is not None:
-            self.opencti.log("info", "Deleting Case Incident {%s}.", id)
+            self.opencti.app_logger.info("Deleting Case Incident", {"id": id})
             query = """
                  mutation CaseIncidentDelete($id: ID!) {
                      stixDomainObjectEdit(id: $id) {
@@ -947,5 +941,7 @@ class CaseIncident:
              """
             self.opencti.query(query, {"id": id})
         else:
-            self.opencti.log("error", "[opencti_case_incident] Missing parameters: id")
+            self.opencti.app_logger.error(
+                "[opencti_case_incident] Missing parameters: id"
+            )
             return None

pycti/entities/opencti_case_rfi.py

@@ -5,8 +5,6 @@ import uuid
 from dateutil.parser import parse
 from stix2.canonicalization.Canonicalize import canonicalize
 
-from pycti.entities import LOGGER
-
 
 class CaseRfi:
     def __init__(self, opencti):
@@ -495,9 +493,8 @@ class CaseRfi:
         if get_all:
             first = 500
 
-        self.opencti.log(
-            "info",
-            "Listing Case Rfis with filters " + json.dumps(filters) + ".",
+        self.opencti.app_logger.info(
+            "Listing Case Rfis with filters", {"filters": json.dumps(filters)}
         )
         query = (
             """
@@ -542,7 +539,7 @@ class CaseRfi:
             final_data = final_data + data
             while result["data"]["caseRfis"]["pageInfo"]["hasNextPage"]:
                 after = result["date"]["caseRfis"]["pageInfo"]["endCursor"]
-                self.opencti.log("info", "Listing Case Rfis after " + after)
+                self.opencti.app_logger.info("Listing Case Rfis", {"after": after})
                 result = self.opencti.query(
                     query,
                     {
@@ -576,7 +573,7 @@ class CaseRfi:
         custom_attributes = kwargs.get("customAttributes", None)
         with_files = kwargs.get("withFiles", False)
         if id is not None:
-            self.opencti.log("info", "Reading Case Rfi { " + id + "}.")
+            self.opencti.app_logger.info("Reading Case Rfi", {"id": id})
             query = (
                 """
                         query CaseRfi($id: String!) {
@@ -647,13 +644,12 @@ class CaseRfi:
             "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 CaseRfi {"
-                + id
-                + "}",
+            self.opencti.app_logger.info(
+                "Checking StixObjectOrStixRelationship in CaseRfi",
+                {
+                    "stix_object_or_stix_relationship_id": stix_object_or_stix_relationship_id,
+                    "id": id,
+                },
             )
             query = """
                 query CaseRfiContainsStixObjectOrStixRelationship($id: String!, $stixObjectOrStixRelationshipId: String!) {
@@ -669,9 +665,8 @@ class CaseRfi:
             )
             return result["data"]["caseRfiContainsStixObjectOrStixRelationship"]
         else:
-            self.opencti.log(
-                "error",
-                "[opencti_caseRfi] Missing parameters: id or stixObjectOrStixRelationshipId",
+            self.opencti.app_logger.error(
+                "[opencti_caseRfi] Missing parameters: id or stixObjectOrStixRelationshipId"
             )
 
     """
@@ -701,7 +696,7 @@ class CaseRfi:
         information_types = kwargs.get("information_types", None)
 
         if name is not None:
-            self.opencti.log("info", "Creating Case Rfi {" + name + "}.")
+            self.opencti.app_logger.info("Creating Case Rfi", {"name": name})
             query = """
                 mutation CaseRfiAdd($input: CaseRfiAddInput!) {
                     caseRfiAdd(input: $input) {
@@ -738,10 +733,7 @@ class CaseRfi:
             )
             return self.opencti.process_multiple_fields(result["data"]["caseRfiAdd"])
         else:
-            self.opencti.log(
-                "error",
-                "[opencti_caseRfi] Missing parameters: name",
-            )
+            self.opencti.app_logger.error("[opencti_caseRfi] Missing parameters: name")
 
         """
         Add a Stix-Entity object to Case Rfi object (object_refs)
@@ -757,13 +749,12 @@ class CaseRfi:
             "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 CaseRfi {"
-                + id
-                + "}",
+            self.opencti.app_logger.info(
+                "Adding StixObjectOrStixRelationship in CaseRfi",
+                {
+                    "stix_object_or_stix_relationship_id": stix_object_or_stix_relationship_id,
+                    "id": id,
+                },
             )
             query = """
                mutation CaseRfiEditRelationAdd($id: ID!, $input: StixRefRelationshipAddInput) {
@@ -786,9 +777,8 @@ class CaseRfi:
             )
             return True
         else:
-            self.opencti.log(
-                "error",
-                "[opencti_caseRfi] Missing parameters: id and stixObjectOrStixRelationshipId",
+            self.opencti.app_logger.info(
+                "[opencti_caseRfi] Missing parameters: id and stixObjectOrStixRelationshipId"
             )
             return False
 
@@ -806,13 +796,12 @@ class CaseRfi:
             "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 CaseRfi {"
-                + id
-                + "}",
+            self.opencti.app_logger.info(
+                "Removing StixObjectOrStixRelationship in CaseRfi",
+                {
+                    "stix_object_or_stix_relationship_id": stix_object_or_stix_relationship_id,
+                    "id": id,
+                },
             )
             query = """
                mutation CaseRfiEditRelationDelete($id: ID!, $toId: StixRef!, $relationship_type: String!) {
@@ -833,9 +822,8 @@ class CaseRfi:
             )
             return True
         else:
-            self.opencti.log(
-                "error",
-                "[opencti_caseRfi] Missing parameters: id and stixObjectOrStixRelationshipId",
+            self.opencti.app_logger.error(
+                "[opencti_caseRfi] Missing parameters: id and stixObjectOrStixRelationshipId"
             )
             return False
 
@@ -901,14 +889,14 @@ class CaseRfi:
                 else None,
             )
         else:
-            self.opencti.log(
-                "error", "[opencti_caseRfi] Missing parameters: stixObject"
+            self.opencti.app_logger.error(
+                "[opencti_caseRfi] Missing parameters: stixObject"
             )
 
     def delete(self, **kwargs):
         id = kwargs.get("id", None)
         if id is not None:
-            LOGGER.info("Deleting Case RFI {%s}.", id)
+            self.opencti.app_logger.info("Deleting Case RFI", {"id": id})
             query = """
                  mutation CaseRFIDelete($id: ID!) {
                      stixDomainObjectEdit(id: $id) {
@@ -918,5 +906,5 @@ class CaseRfi:
              """
             self.opencti.query(query, {"id": id})
         else:
-            LOGGER.error("[opencti_case_rfi] Missing parameters: id")
+            self.opencti.app_logger.error("[opencti_case_rfi] Missing parameters: id")
             return None