Skip to content

Fix granular marking selectors for nested STIX sub-objects (#585) #644

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

Open
arpitjain099 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix granular marking selectors for nested STIX sub-objects (#585) #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions stix2/markings/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Utility functions for STIX2 data markings."""

import collections
import collections.abc

from stix2 import exceptions, utils

Expand Down Expand Up @@ -232,7 +232,7 @@ def iterpath(obj, path=None):
path.append(varname)
yield (path, varobj)

if isinstance(varobj, dict):
if isinstance(varobj, collections.abc.Mapping):

for item in iterpath(varobj, path):
yield item
Expand All @@ -245,7 +245,7 @@ def iterpath(obj, path=None):

yield (path, item)

if isinstance(item, dict):
if isinstance(item, collections.abc.Mapping):
for descendant in iterpath(item, path):
yield descendant

Expand Down
17 changes: 17 additions & 0 deletions stix2/test/v21/test_granular_markings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,23 @@ def test_add_marking_mark_same_property_same_marking():
assert m in after["granular_markings"]


def test_add_marking_mark_nested_sub_object_property():
# A selector reaching into a STIX sub-object such as external_references
# is valid per STIX 2.1 section 7.2.3.1, which gives the example
# external_references.[0].source_name.
kwargs = MALWARE_KWARGS.copy()
kwargs["external_references"] = [
{"source_name": "capec", "external_id": "CAPEC-163"},
]
before = Malware(**kwargs)
selector = "external_references.[0].source_name"

after = markings.add_markings(before, [MARKING_IDS[0]], [selector])

assert after["granular_markings"][0]["selectors"] == [selector]
assert after["granular_markings"][0]["marking_ref"] == MARKING_IDS[0]


@pytest.mark.parametrize(
"data,marking", [
(
Expand Down