[client] Modify client to handle stix embedded files #1589

Author: richard-julien

pycti/entities/opencti_attack_pattern.py

@@ -93,6 +93,7 @@ def __init__(self, opencti):
                                     size
                                     metaData {
                                         mimetype
+                                        version
                                     }
                                 }
                             }
@@ -133,6 +134,7 @@ def __init__(self, opencti):
                         size
                         metaData {
                             mimetype
+                            version
                         }
                     }
                 }

pycti/entities/opencti_campaign.py

@@ -93,6 +93,7 @@ def __init__(self, opencti):
                                     size
                                     metaData {
                                         mimetype
+                                        version
                                     }
                                 }
                             }
@@ -118,6 +119,7 @@ def __init__(self, opencti):
                         size
                         metaData {
                             mimetype
+                            version
                         }
                     }
                 }

pycti/entities/opencti_course_of_action.py

@@ -93,6 +93,7 @@ def __init__(self, opencti):
                                     size
                                     metaData {
                                         mimetype
+                                        version
                                     }
                                 }
                             }
@@ -116,6 +117,7 @@ def __init__(self, opencti):
                         size
                         metaData {
                             mimetype
+                            version
                         }
                     }
                 }

pycti/entities/opencti_external_reference.py

@@ -31,6 +31,7 @@ def __init__(self, opencti, file):
                         size
                         metaData {
                             mimetype
+                            version
                         }
                     }
                 }
@@ -211,41 +212,30 @@ def add_file(self, **kwargs):
         data = kwargs.get("data", None)
         mime_type = kwargs.get("mime_type", "text/plain")
         if id is not None and file_name is not None:
-            external_reference = self.read(id=id)
-            if external_reference is None:
-                self.opencti.log("error", "Cannot add File, entity not found")
-                return False
             final_file_name = os.path.basename(file_name)
-            current_files = {}
-            for file in external_reference["importFiles"]:
-                current_files[file["name"]] = file
-            if final_file_name in current_files:
-                return current_files[final_file_name]
-            else:
-                self.opencti.log(
-                    "info", "Uploading a file in Stix-Domain-Object {" + id + "}."
-                )
-                query = """
-                    mutation ExternalReferenceEdit($id: ID!, $file: Upload!) {
-                        externalReferenceEdit(id: $id) {
-                            importPush(file: $file) {
-                                id
-                                name
-                            }
+            query = """
+                mutation ExternalReferenceEdit($id: ID!, $file: Upload!) {
+                    externalReferenceEdit(id: $id) {
+                        importPush(file: $file) {
+                            id
+                            name
                         }
                     }
-                 """
-                if data is None:
-                    data = open(file_name, "rb")
-                    if file_name.endswith(".json"):
-                        mime_type = "application/json"
-                    else:
-                        mime_type = magic.from_file(file_name, mime=True)
-
-                return self.opencti.query(
-                    query,
-                    {"id": id, "file": (self.file(final_file_name, data, mime_type))},
-                )
+                }
+             """
+            if data is None:
+                data = open(file_name, "rb")
+                if file_name.endswith(".json"):
+                    mime_type = "application/json"
+                else:
+                    mime_type = magic.from_file(file_name, mime=True)
+            self.opencti.log(
+                "info", "Uploading a file {" + final_file_name + "} in Stix-Domain-Object {" + id + "}."
+            )
+            return self.opencti.query(
+                query,
+                {"id": id, "file": (self.file(final_file_name, data, mime_type))},
+            )
         else:
             self.opencti.log(
                 "error",
@@ -314,6 +304,7 @@ def list_files(self, **kwargs):
                                 size
                                 metaData {
                                     mimetype
+                                    version
                                 }
                             }
                         }

pycti/entities/opencti_identity.py

@@ -95,6 +95,7 @@ def __init__(self, opencti):
                                     size
                                     metaData {
                                         mimetype
+                                        version
                                     }
                                 }
                             }
@@ -127,6 +128,7 @@ def __init__(self, opencti):
                         size
                         metaData {
                             mimetype
+                            version
                         }
                     }
                 }

pycti/entities/opencti_incident.py

@@ -93,6 +93,7 @@ def __init__(self, opencti):
                                     size
                                     metaData {
                                         mimetype
+                                        version
                                     }
                                 }
                             }
@@ -118,6 +119,7 @@ def __init__(self, opencti):
                         size
                         metaData {
                             mimetype
+                            version
                         }
                     }
                 }

pycti/entities/opencti_indicator.py

@@ -98,6 +98,7 @@ def __init__(self, opencti):
                                     size
                                     metaData {
                                         mimetype
+                                        version
                                     }
                                 }
                             }
@@ -151,6 +152,7 @@ def __init__(self, opencti):
                         size
                         metaData {
                             mimetype
+                            version
                         }
                     }
                 }

pycti/entities/opencti_infrastructure.py

@@ -98,6 +98,7 @@ def __init__(self, opencti):
                                     size
                                     metaData {
                                         mimetype
+                                        version
                                     }
                                 }
                             }
@@ -136,6 +137,7 @@ def __init__(self, opencti):
                         size
                         metaData {
                             mimetype
+                            version
                         }
                     }
                 }

pycti/entities/opencti_intrusion_set.py

@@ -93,6 +93,7 @@ def __init__(self, opencti):
                                     size
                                     metaData {
                                         mimetype
+                                        version
                                     }
                                 }
                             }
@@ -121,6 +122,7 @@ def __init__(self, opencti):
                         size
                         metaData {
                             mimetype
+                            version
                         }
                     }
                 }

pycti/entities/opencti_location.py

@@ -93,6 +93,7 @@ def __init__(self, opencti):
                                     size
                                     metaData {
                                         mimetype
+                                        version
                                     }
                                 }
                             }
@@ -118,6 +119,7 @@ def __init__(self, opencti):
                         size
                         metaData {
                             mimetype
+                            version
                         }
                     }
                 }