[client] PR review

Author: JeremyCloarec

pycti/api/opencti_api_playbook.py

@@ -35,14 +35,20 @@ def playbook_step_execution(self, playbook: dict, bundle: str):
 
     def delete(self, **kwargs):
         id = kwargs.get("id", None)
-        query = """
-            mutation PlaybookDelete($id: ID!) {
-                playbookDelete(id: $id)
-            }
-           """
-        self.api.query(
-            query,
-            {
-                "id": id,
-            },
-        )
+        if id is not None:
+            query = """
+                mutation PlaybookDelete($id: ID!) {
+                    playbookDelete(id: $id)
+                }
+               """
+            self.api.query(
+                query,
+                {
+                    "id": id,
+                },
+            )
+        else:
+            self.opencti.app_logger.error(
+                "[stix_playbook] Cant delete playbook, missing parameters: id"
+            )
+            return None

pycti/api/opencti_api_public_dashboard.py

@@ -6,14 +6,20 @@ def __init__(self, api):
 
     def delete(self, **kwargs):
         id = kwargs.get("id", None)
-        query = """
-            mutation PublicDashboardDelete($id: ID!) {
-                publicDashboardDelete(id: $id)
-            }
-           """
-        self.api.query(
-            query,
-            {
-                "id": id,
-            },
-        )
+        if id is not None:
+            query = """
+                mutation PublicDashboardDelete($id: ID!) {
+                    publicDashboardDelete(id: $id)
+                }
+               """
+            self.api.query(
+                query,
+                {
+                    "id": id,
+                },
+            )
+        else:
+            self.opencti.app_logger.error(
+                "[stix_public_dashboard] Cant delete public dashboard, missing parameters: id"
+            )
+            return None

pycti/api/opencti_api_trash.py

@@ -18,16 +18,17 @@ def restore(self, operation_id: str):
         )
 
     def delete(self, **kwargs):
-        """Delete a role given its ID
+        """Delete a trash item given its ID
 
-        :param id: ID for the role on the platform.
+        :param id: ID for the delete operation on the platform.
         :type id: str
         """
         id = kwargs.get("id", None)
         if id is None:
-            self.api.admin_logger.error("[opencti_role] Missing parameter: id")
+            self.api.admin_logger.error(
+                "[opencti_trash] Cant confirm delete, missing parameter: id"
+            )
             return None
-
         query = """
             mutation DeleteOperationConfirm($id: ID!) {
                 deleteOperationConfirm(id: $id) {

pycti/api/opencti_api_work.py

@@ -133,6 +133,11 @@ def delete_work(self, work_id: str):
 
     def delete(self, **kwargs):
         id = kwargs.get("id", None)
+        if id is None:
+            self.opencti.admin_logger.error(
+                "[opencti_work] Cant delete work, missing parameter: id"
+            )
+            return None
         query = """
         mutation ConnectorWorksMutation($workId: ID!) {
             workEdit(id: $workId) {

pycti/api/opencti_api_workspace.py

@@ -6,6 +6,11 @@ def __init__(self, api):
 
     def delete(self, **kwargs):
         id = kwargs.get("id", None)
+        if id is None:
+            self.api.admin_logger.error(
+                "[opencti_workspace] Cant delete workspace, missing parameter: id"
+            )
+            return None
         query = """
             mutation WorkspaceDelete($id: ID!) {
                 workspaceDelete(id: $id)

pycti/entities/opencti_group.py

@@ -323,7 +323,9 @@ def delete(self, **kwargs):
         """
         id = kwargs.get("id", None)
         if id is None:
-            self.opencti.admin_logger.error("[opencti_user] Missing parameter: id")
+            self.opencti.admin_logger.error(
+                "[opencti_group] Cant delete group, missing parameter: id"
+            )
             return None
         self.opencti.admin_logger.info("Deleting group", {"id": id})
         query = """

pycti/entities/opencti_indicator.py

@@ -334,7 +334,7 @@ def update_field(self, **kwargs):
             )
         else:
             self.opencti.app_logger.error(
-                "[opencti_stix_domain_object] Missing parameters: id and input"
+                "[opencti_stix_domain_object] Cant update indicator field, missing parameters: id and input"
             )
             return None
 

pycti/entities/opencti_stix_core_object.py

@@ -1702,7 +1702,9 @@ def rule_apply(self, **kwargs):
             """
             self.opencti.query(query, {"elementId": element_id, "ruleId": rule_id})
         else:
-            self.opencti.app_logger.error("[stix_core_object] Missing parameters: id")
+            self.opencti.app_logger.error(
+                "[stix_core_object] Cant apply rule, missing parameters: id"
+            )
             return None
 
     """
@@ -1727,7 +1729,9 @@ def rule_clear(self, **kwargs):
             """
             self.opencti.query(query, {"elementId": element_id, "ruleId": rule_id})
         else:
-            self.opencti.app_logger.error("[stix_core_object] Missing parameters: id")
+            self.opencti.app_logger.error(
+                "[stix_core_object] Cant clear rule, missing parameters: id"
+            )
             return None
 
     """
@@ -1750,7 +1754,9 @@ def rules_rescan(self, **kwargs):
             """
             self.opencti.query(query, {"elementId": element_id})
         else:
-            self.opencti.app_logger.error("[stix_core_object] Missing parameters: id")
+            self.opencti.app_logger.error(
+                "[stix_core_object] Cant rescan rule, missing parameters: id"
+            )
             return None
 
     """
@@ -1779,7 +1785,9 @@ def clear_access_restriction(self, **kwargs):
                 },
             )
         else:
-            self.opencti.app_logger.error("[stix_core_object] Missing parameters: id")
+            self.opencti.app_logger.error(
+                "[stix_core_object] Cant clear access restriction, missing parameters: id"
+            )
             return None
 
     """
@@ -1937,5 +1945,7 @@ def remove_from_draft(self, **kwargs):
             """
             self.opencti.query(query, {"id": id})
         else:
-            self.opencti.app_logger.error("[stix_core_object] Missing parameters: id")
+            self.opencti.app_logger.error(
+                "[stix_core_object] Cant remove from draft, missing parameters: id"
+            )
             return None

pycti/utils/opencti_stix2.py

@@ -2543,7 +2543,7 @@ def organization_unshare(self, item):
     def element_operation_delete(self, item, operation):
         # If data is stix, just use the generic stix function for deletion
         if item["type"] in STIX_OBJECTS:
-            force_delete = operation == "delete-force"
+            force_delete = operation == "delete_force"
             self.opencti.stix.delete(id=item["id"], force_delete=force_delete)
         else:
             # Element is not knowledge we need to use the right api