[client] Fix administrative entities parsing (#827)

Author: richard-julien

pycti/api/opencti_api_client.py

@@ -639,43 +639,6 @@ def process_multiple_fields(self, data):
         if "importFiles" in data:
             data["importFiles"] = self.process_multiple(data["importFiles"])
             data["importFilesIds"] = self.process_multiple_ids(data["importFiles"])
-
-        # Administrative data
-        if "groups" in data:
-            data["groups"] = self.process_multiple(data["groups"])
-            data["groupsIds"] = self.process_multiple_ids(data["groups"])
-        if "objectOrganization" in data:
-            data["objectOrganization"] = self.process_multiple(
-                data["objectOrganization"]
-            )
-            data["objectOrganizationIds"] = self.process_multiple_ids(
-                data["objectOrganization"]
-            )
-        if "roles" in data:
-            data["roles"] = self.process_multiple(data["roles"])
-            data["rolesIds"] = self.process_multiple_ids(data["roles"])
-        if "capabilities" in data:
-            data["capabilities"] = self.process_multiple(data["capabilities"])
-            data["capabilitiesIds"] = self.process_multiple_ids(data["capabilities"])
-        if "members" in data:
-            data["members"] = self.process_multiple(data["members"])
-            data["membersIds"] = self.process_multiple_ids(data["members"])
-        if "platform_messages" in data:
-            data["platform_messages"] = self.process_multiple(data["platform_messages"])
-            data["platform_messages_ids"] = self.process_multiple_ids(
-                data["platform_messages"]
-            )
-        if "messages_administration" in data:
-            data["messages_administration"] = self.process_multiple(
-                data["messages_administration"]
-            )
-            data["messages_administration_ids"] = self.process_multiple_ids(
-                data["messages_administration"]
-            )
-        if "recipients" in data:
-            data["recipients"] = self.process_multiple(data["recipients"])
-            data["recipientsIds"] = self.process_multiple_ids(data["recipients"])
-
         # See aliases of GraphQL query in stix_core_object method
         if "name_alt" in data:
             data["name"] = data["name_alt"]

pycti/entities/opencti_group.py

@@ -705,3 +705,12 @@ def delete_allowed_marking(self, **kwargs) -> Optional[Dict]:
         return self.opencti.process_multiple_fields(
             result["data"]["groupEdit"]["relationDelete"]
         )
+
+    def process_multiple_fields(self, data):
+        if "roles" in data:
+            data["roles"] = self.opencti.process_multiple(data["roles"])
+            data["rolesIds"] = self.opencti.process_multiple_ids(data["roles"])
+        if "members" in data:
+            data["members"] = self.opencti.process_multiple(data["members"])
+            data["membersIds"] = self.opencti.process_multiple_ids(data["members"])
+        return data

pycti/entities/opencti_role.py

@@ -398,3 +398,11 @@ def delete_capability(self, **kwargs) -> Optional[Dict]:
         return self.opencti.process_multiple_fields(
             result["data"]["roleEdit"]["relationDelete"]
         )
+
+    def process_multiple_fields(self, data):
+        if "capabilities" in data:
+            data["capabilities"] = self.opencti.process_multiple(data["capabilities"])
+            data["capabilitiesIds"] = self.opencti.process_multiple_ids(
+                data["capabilities"]
+            )
+        return data

pycti/entities/opencti_settings.py

@@ -138,6 +138,7 @@ def __init__(self, opencti):
             }
         """
         self.messages_properties = """
+            entity_type
             platform_messages {
                 id, message, activated, dismissible, updated_at, color
                 recipients {
@@ -365,3 +366,20 @@ def delete_message(self, **kwargs) -> Optional[Dict]:
         return self.opencti.process_multiple_fields(
             result["data"]["settingsEdit"]["deleteMessage"]
         )
+
+    def process_multiple_fields(self, data):
+        if "platform_messages" in data:
+            data["platform_messages"] = self.opencti.process_multiple(
+                data["platform_messages"]
+            )
+            data["platform_messages_ids"] = self.opencti.process_multiple_ids(
+                data["platform_messages"]
+            )
+        if "messages_administration" in data:
+            data["messages_administration"] = self.opencti.process_multiple(
+                data["messages_administration"]
+            )
+            data["messages_administration_ids"] = self.opencti.process_multiple_ids(
+                data["messages_administration"]
+            )
+        return data

pycti/entities/opencti_user.py

@@ -784,3 +784,20 @@ def token_renew(self, **kwargs) -> Optional[Dict]:
         return self.opencti.process_multiple_fields(
             result["data"]["userEdit"]["tokenRenew"]
         )
+
+    def process_multiple_fields(self, data):
+        if "roles" in data:
+            data["roles"] = self.opencti.process_multiple(data["roles"])
+            data["rolesIds"] = self.opencti.process_multiple_ids(data["roles"])
+        if "groups" in data:
+            data["groups"] = self.opencti.process_multiple(data["groups"])
+            data["groupsIds"] = self.opencti.process_multiple_ids(data["groups"])
+        if "objectOrganization" in data:
+            data["objectOrganization"] = self.opencti.process_multiple(
+                data["objectOrganization"]
+            )
+            data["objectOrganizationIds"] = self.opencti.process_multiple_ids(
+                data["objectOrganization"]
+            )
+
+        return data