Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pycti/entities/opencti_external_reference.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,12 +276,13 @@ def add_file(self, **kwargs):
file_markings = kwargs.get("fileMarkings", None)
mime_type = kwargs.get("mime_type", "text/plain")
no_trigger_import = kwargs.get("no_trigger_import", False)
embedded = kwargs.get("embedded", False)
if id is not None and file_name is not None:
final_file_name = os.path.basename(file_name)
query = """
mutation ExternalReferenceEdit($id: ID!, $file: Upload!, $fileMarkings: [String], $version: DateTime, $noTriggerImport: Boolean) {
mutation ExternalReferenceEdit($id: ID!, $file: Upload!, $fileMarkings: [String], $version: DateTime, $noTriggerImport: Boolean, $embedded: Boolean) {
externalReferenceEdit(id: $id) {
importPush(file: $file, fileMarkings: $fileMarkings, version: $version, noTriggerImport: $noTriggerImport) {
importPush(file: $file, fileMarkings: $fileMarkings, version: $version, noTriggerImport: $noTriggerImport, embedded: $embedded) {
id
name
}
Expand Down Expand Up @@ -310,6 +311,7 @@ def add_file(self, **kwargs):
if isinstance(no_trigger_import, bool)
else no_trigger_import == "True"
),
"embedded": embedded,
},
)
else:
Expand Down
6 changes: 4 additions & 2 deletions pycti/entities/opencti_stix_cyber_observable.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,13 @@ def add_file(self, **kwargs):
version = kwargs.get("version", None)
mime_type = kwargs.get("mime_type", "text/plain")
no_trigger_import = kwargs.get("no_trigger_import", False)
embedded = kwargs.get("embedded", False)
if id is not None and file_name is not None:
final_file_name = os.path.basename(file_name)
query = """
mutation StixCyberObservableEdit($id: ID!, $file: Upload!, $fileMarkings: [String], $version: DateTime, $noTriggerImport: Boolean) {
mutation StixCyberObservableEdit($id: ID!, $file: Upload!, $fileMarkings: [String], $version: DateTime, $noTriggerImport: Boolean, $embedded: Boolean) {
stixCyberObservableEdit(id: $id) {
importPush(file: $file, version: $version, fileMarkings: $fileMarkings, noTriggerImport: $noTriggerImport) {
importPush(file: $file, version: $version, fileMarkings: $fileMarkings, noTriggerImport: $noTriggerImport, embedded: $embedded) {
id
name
}
Expand Down Expand Up @@ -219,6 +220,7 @@ def add_file(self, **kwargs):
if isinstance(no_trigger_import, bool)
else no_trigger_import == "True"
),
"embedded": embedded,
},
)
else:
Expand Down
6 changes: 4 additions & 2 deletions pycti/entities/opencti_stix_domain_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -1368,12 +1368,13 @@ def add_file(self, **kwargs):
version = kwargs.get("version", None)
mime_type = kwargs.get("mime_type", "text/plain")
no_trigger_import = kwargs.get("no_trigger_import", False)
embedded = kwargs.get("embedded", False)
if id is not None and file_name is not None:
final_file_name = os.path.basename(file_name)
query = """
mutation StixDomainObjectEdit($id: ID!, $file: Upload!, $fileMarkings: [String], $version: DateTime, $noTriggerImport: Boolean) {
mutation StixDomainObjectEdit($id: ID!, $file: Upload!, $fileMarkings: [String], $version: DateTime, $noTriggerImport: Boolean, $embedded: Boolean) {
stixDomainObjectEdit(id: $id) {
importPush(file: $file, version: $version, fileMarkings: $fileMarkings, noTriggerImport: $noTriggerImport) {
importPush(file: $file, version: $version, fileMarkings: $fileMarkings, noTriggerImport: $noTriggerImport, embedded: $embedded) {
id
name
}
Expand Down Expand Up @@ -1402,6 +1403,7 @@ def add_file(self, **kwargs):
if isinstance(no_trigger_import, bool)
else no_trigger_import == "True"
),
"embedded": embedded,
},
)
else:
Expand Down
9 changes: 9 additions & 0 deletions pycti/utils/opencti_stix2.py
Original file line number Diff line number Diff line change
Expand Up @@ -758,6 +758,7 @@ def extract_embedded_relationships(
fileMarkings=file.get("object_marking_refs", None),
mime_type=file["mime_type"],
no_trigger_import=file.get("no_trigger_import", False),
embedded=file.get("embedded", False),
)
if (
self.opencti.get_attribute_in_extension("files", external_reference)
Expand All @@ -775,6 +776,7 @@ def extract_embedded_relationships(
fileMarkings=file.get("object_marking_refs", None),
mime_type=file["mime_type"],
no_trigger_import=file.get("no_trigger_import", False),
embedded=file.get("embedded", False),
)
external_references_ids.append(external_reference_id)
# Granted refs
Expand Down Expand Up @@ -1042,6 +1044,7 @@ def import_object(
if "x_opencti_files" in stix_object:
for file in stix_object["x_opencti_files"]:
if "data" in file:
print(file)
self.opencti.stix_domain_object.add_file(
id=stix_object_result["id"],
file_name=file["name"],
Expand All @@ -1050,6 +1053,7 @@ def import_object(
fileMarkings=file.get("object_marking_refs", None),
mime_type=file["mime_type"],
no_trigger_import=file.get("no_trigger_import", False),
embedded=file.get("embedded", False),
)
if (
self.opencti.get_attribute_in_extension("files", stix_object)
Expand All @@ -1059,6 +1063,7 @@ def import_object(
"files", stix_object
):
if "data" in file:
print(file)
self.opencti.stix_domain_object.add_file(
id=stix_object_result["id"],
file_name=file["name"],
Expand All @@ -1067,6 +1072,7 @@ def import_object(
fileMarkings=file.get("object_marking_refs", None),
mime_type=file["mime_type"],
no_trigger_import=file.get("no_trigger_import", False),
embedded=file.get("embedded", False),
)
return stix_object_results

Expand Down Expand Up @@ -1179,6 +1185,7 @@ def import_observable(
fileMarkings=file.get("object_marking_refs", None),
mime_type=file["mime_type"],
no_trigger_import=file.get("no_trigger_import", False),
embedded=file.get("embedded", False),
)
if (
self.opencti.get_attribute_in_extension("files", stix_object)
Expand All @@ -1196,6 +1203,7 @@ def import_observable(
fileMarkings=file.get("object_marking_refs", None),
mime_type=file["mime_type"],
no_trigger_import=file.get("no_trigger_import", False),
embedded=file.get("embedded", False),
)
if "id" in stix_object:
self.mapping_cache[stix_object["id"]] = {
Expand Down Expand Up @@ -2472,6 +2480,7 @@ def apply_patch_files(self, item):
fileMarkings=file.get("object_marking_refs", None),
mime_type=file.get("mime_type", None),
no_trigger_import=file.get("no_trigger_import", False),
embedded=file.get("embedded", False),
)

def apply_patch(self, item):
Expand Down