Skip to content

[client] now use internal id when possible for patch operations #888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 25, 2025
Merged

[client] now use internal id when possible for patch operations #888

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff95147
[client] now use internal id when possible for patch operations
JeremyCloarec Apr 24, 2025
e6f9a8d
[client] now use internal id when possible for patch operations
JeremyCloarec Apr 24, 2025
7a92ef2
[client] linter fix
JeremyCloarec Apr 24, 2025
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
18 changes: 12 additions & 6 deletions pycti/utils/opencti_stix2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2418,6 +2418,9 @@ def apply_patch_files(self, item):
field_patch_files = next(
(op for op in field_patch if op["key"] == "x_opencti_files"), None
)
item_id = self.opencti.get_attribute_in_extension("id", item)
if item_id is None:
item_id = item["id"]
do_add_file = self.opencti.stix_domain_object.add_file
if StixCyberObservableTypes.has_value(item["type"]):
do_add_file = self.opencti.stix_cyber_observable.add_file
Expand All @@ -2427,7 +2430,7 @@ def apply_patch_files(self, item):
for file in field_patch_files["value"]:
if "data" in file:
do_add_file(
id=item["id"],
id=item_id,
file_name=file["name"],
version=file.get("version", None),
data=base64.b64decode(file["data"]),
Expand All @@ -2445,26 +2448,29 @@ def apply_patch(self, item):
field_patch_without_files = [
op for op in field_patch if op["key"] != "x_opencti_files"
]
item_id = self.opencti.get_attribute_in_extension("id", item)
if item_id is None:
item_id = item["id"]
if len(field_patch_without_files) > 0:
if item["type"] == "relationship":
self.opencti.stix_core_relationship.update_field(
id=item["id"], input=field_patch_without_files
id=item_id, input=field_patch_without_files
)
elif item["type"] == "sighting":
self.opencti.stix_sighting_relationship.update_field(
id=item["id"], input=field_patch_without_files
id=item_id, input=field_patch_without_files
)
elif StixCyberObservableTypes.has_value(item["type"]):
self.opencti.stix_cyber_observable.update_field(
id=item["id"], input=field_patch_without_files
id=item_id, input=field_patch_without_files
)
elif item["type"] == "external-reference":
self.opencti.external_reference.update_field(
id=item["id"], input=field_patch_without_files
id=item_id, input=field_patch_without_files
)
else:
self.opencti.stix_domain_object.update_field(
id=item["id"], input=field_patch_without_files
id=item_id, input=field_patch_without_files
)
self.apply_patch_files(item)

Expand Down