Make markings function signatures consistent
Put `marking` before `selectors`. The granular marking version of `is_marked` requires selectors to not be None.stix2.1
Chris Lenk
parent
124da846c3
commit
cc66e1a492
|
|
@ -8,7 +8,7 @@ granular markings unless otherwise noted in each of the functions.
|
|||
from stix2.markings import granular_markings, object_markings
|
||||
|
||||
|
||||
def get_markings(obj, selectors, inherited=False, descendants=False):
|
||||
def get_markings(obj, selectors=None, inherited=False, descendants=False):
|
||||
"""
|
||||
Get all markings associated to the field(s).
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ def get_markings(obj, selectors, inherited=False, descendants=False):
|
|||
return list(set(results))
|
||||
|
||||
|
||||
def set_markings(obj, selectors, marking):
|
||||
def set_markings(obj, marking, selectors=None):
|
||||
"""
|
||||
Removes all markings associated with selectors and appends a new granular
|
||||
marking. Refer to `clear_markings` and `add_markings` for details.
|
||||
|
|
@ -69,10 +69,10 @@ def set_markings(obj, selectors, marking):
|
|||
if selectors is None:
|
||||
return object_markings.set_markings(obj, marking)
|
||||
else:
|
||||
return granular_markings.set_markings(obj, selectors, marking)
|
||||
return granular_markings.set_markings(obj, marking, selectors)
|
||||
|
||||
|
||||
def remove_markings(obj, selectors, marking):
|
||||
def remove_markings(obj, marking, selectors=None):
|
||||
"""
|
||||
Removes granular_marking from the granular_markings collection.
|
||||
|
||||
|
|
@ -99,10 +99,10 @@ def remove_markings(obj, selectors, marking):
|
|||
if selectors is None:
|
||||
return object_markings.remove_markings(obj, marking)
|
||||
else:
|
||||
return granular_markings.remove_markings(obj, selectors, marking)
|
||||
return granular_markings.remove_markings(obj, marking, selectors)
|
||||
|
||||
|
||||
def add_markings(obj, selectors, marking):
|
||||
def add_markings(obj, marking, selectors=None):
|
||||
"""
|
||||
Appends a granular_marking to the granular_markings collection.
|
||||
|
||||
|
|
@ -127,10 +127,10 @@ def add_markings(obj, selectors, marking):
|
|||
if selectors is None:
|
||||
return object_markings.add_markings(obj, marking)
|
||||
else:
|
||||
return granular_markings.add_markings(obj, selectors, marking)
|
||||
return granular_markings.add_markings(obj, marking, selectors)
|
||||
|
||||
|
||||
def clear_markings(obj, selectors):
|
||||
def clear_markings(obj, selectors=None):
|
||||
"""
|
||||
Removes all granular_marking associated with the selectors.
|
||||
|
||||
|
|
@ -158,7 +158,7 @@ def clear_markings(obj, selectors):
|
|||
return granular_markings.clear_markings(obj, selectors)
|
||||
|
||||
|
||||
def is_marked(obj, selectors, marking=None, inherited=False, descendants=False):
|
||||
def is_marked(obj, marking=None, selectors=None, inherited=False, descendants=False):
|
||||
"""
|
||||
Checks if field(s) is marked by any marking or by specific marking(s).
|
||||
|
||||
|
|
@ -190,8 +190,8 @@ def is_marked(obj, selectors, marking=None, inherited=False, descendants=False):
|
|||
|
||||
result = granular_markings.is_marked(
|
||||
obj,
|
||||
selectors,
|
||||
marking,
|
||||
selectors,
|
||||
inherited,
|
||||
descendants
|
||||
)
|
||||
|
|
@ -203,8 +203,8 @@ def is_marked(obj, selectors, marking=None, inherited=False, descendants=False):
|
|||
if granular_marks:
|
||||
result = granular_markings.is_marked(
|
||||
obj,
|
||||
selectors,
|
||||
granular_marks,
|
||||
selectors,
|
||||
inherited,
|
||||
descendants
|
||||
)
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ def get_markings(obj, selectors, inherited=False, descendants=False):
|
|||
return list(results)
|
||||
|
||||
|
||||
def set_markings(obj, selectors, marking):
|
||||
def set_markings(obj, marking, selectors):
|
||||
"""
|
||||
Removes all markings associated with selectors and appends a new granular
|
||||
marking. Refer to `clear_markings` and `add_markings` for details.
|
||||
|
|
@ -63,10 +63,10 @@ def set_markings(obj, selectors, marking):
|
|||
|
||||
"""
|
||||
obj = clear_markings(obj, selectors)
|
||||
return add_markings(obj, selectors, marking)
|
||||
return add_markings(obj, marking, selectors)
|
||||
|
||||
|
||||
def remove_markings(obj, selectors, marking):
|
||||
def remove_markings(obj, marking, selectors):
|
||||
"""
|
||||
Removes granular_marking from the granular_markings collection.
|
||||
|
||||
|
|
@ -120,7 +120,7 @@ def remove_markings(obj, selectors, marking):
|
|||
return obj.new_version(granular_markings=None)
|
||||
|
||||
|
||||
def add_markings(obj, selectors, marking):
|
||||
def add_markings(obj, marking, selectors):
|
||||
"""
|
||||
Appends a granular_marking to the granular_markings collection.
|
||||
|
||||
|
|
@ -213,7 +213,7 @@ def clear_markings(obj, selectors):
|
|||
return obj.new_version(granular_markings=None)
|
||||
|
||||
|
||||
def is_marked(obj, selectors, marking=None, inherited=False, descendants=False):
|
||||
def is_marked(obj, marking=None, selectors=None, inherited=False, descendants=False):
|
||||
"""
|
||||
Checks if field is marked by any marking or by specific marking(s).
|
||||
|
||||
|
|
@ -239,6 +239,9 @@ def is_marked(obj, selectors, marking=None, inherited=False, descendants=False):
|
|||
marking identifiers match, True is returned.
|
||||
|
||||
"""
|
||||
if selectors is None:
|
||||
raise TypeError("Required argument 'selectors' must be provided")
|
||||
|
||||
selectors = utils.convert_to_list(selectors)
|
||||
marking = utils.convert_to_list(marking)
|
||||
utils.validate(obj, selectors)
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ def test_add_marking_mark_one_selector_multiple_refs():
|
|||
],
|
||||
**MALWARE_KWARGS
|
||||
)
|
||||
before = markings.add_markings(before, ["description"], [MARKING_IDS[0], MARKING_IDS[1]])
|
||||
before = markings.add_markings(before, [MARKING_IDS[0], MARKING_IDS[1]], ["description"])
|
||||
|
||||
for m in before["granular_markings"]:
|
||||
assert m in after["granular_markings"]
|
||||
|
|
@ -52,7 +52,7 @@ def test_add_marking_mark_multiple_selector_one_refs():
|
|||
],
|
||||
**MALWARE_KWARGS
|
||||
)
|
||||
before = markings.add_markings(before, ["description", "name"], [MARKING_IDS[0]])
|
||||
before = markings.add_markings(before, [MARKING_IDS[0]], ["description", "name"])
|
||||
|
||||
for m in before["granular_markings"]:
|
||||
assert m in after["granular_markings"]
|
||||
|
|
@ -75,7 +75,7 @@ def test_add_marking_mark_multiple_selector_multiple_refs():
|
|||
],
|
||||
**MALWARE_KWARGS
|
||||
)
|
||||
before = markings.add_markings(before, ["description", "name"], [MARKING_IDS[0], MARKING_IDS[1]])
|
||||
before = markings.add_markings(before, [MARKING_IDS[0], MARKING_IDS[1]], ["description", "name"])
|
||||
|
||||
for m in before["granular_markings"]:
|
||||
assert m in after["granular_markings"]
|
||||
|
|
@ -100,7 +100,7 @@ def test_add_marking_mark_another_property_same_marking():
|
|||
],
|
||||
**MALWARE_KWARGS
|
||||
)
|
||||
before = markings.add_markings(before, ["name"], [MARKING_IDS[0]])
|
||||
before = markings.add_markings(before, [MARKING_IDS[0]], ["name"])
|
||||
|
||||
for m in before["granular_markings"]:
|
||||
assert m in after["granular_markings"]
|
||||
|
|
@ -125,7 +125,7 @@ def test_add_marking_mark_same_property_same_marking():
|
|||
],
|
||||
**MALWARE_KWARGS
|
||||
)
|
||||
before = markings.add_markings(before, ["description"], [MARKING_IDS[0]])
|
||||
before = markings.add_markings(before, [MARKING_IDS[0]], ["description"])
|
||||
|
||||
for m in before["granular_markings"]:
|
||||
assert m in after["granular_markings"]
|
||||
|
|
@ -351,7 +351,7 @@ def test_remove_marking_remove_one_selector_with_multiple_refs():
|
|||
],
|
||||
**MALWARE_KWARGS
|
||||
)
|
||||
before = markings.remove_markings(before, ["description"], [MARKING_IDS[0], MARKING_IDS[1]])
|
||||
before = markings.remove_markings(before, [MARKING_IDS[0], MARKING_IDS[1]], ["description"])
|
||||
assert "granular_markings" not in before
|
||||
|
||||
|
||||
|
|
@ -365,7 +365,7 @@ def test_remove_marking_remove_multiple_selector_one_ref():
|
|||
],
|
||||
**MALWARE_KWARGS
|
||||
)
|
||||
before = markings.remove_markings(before, ["description", "modified"], MARKING_IDS[0])
|
||||
before = markings.remove_markings(before, MARKING_IDS[0], ["description", "modified"])
|
||||
assert "granular_markings" not in before
|
||||
|
||||
|
||||
|
|
@ -388,7 +388,7 @@ def test_remove_marking_mark_one_selector_from_multiple_ones():
|
|||
],
|
||||
**MALWARE_KWARGS
|
||||
)
|
||||
before = markings.remove_markings(before, ["modified"], MARKING_IDS[0])
|
||||
before = markings.remove_markings(before, [MARKING_IDS[0]], ["modified"])
|
||||
for m in before["granular_markings"]:
|
||||
assert m in after["granular_markings"]
|
||||
|
||||
|
|
@ -420,7 +420,7 @@ def test_remove_marking_mark_one_selector_markings_from_multiple_ones():
|
|||
],
|
||||
**MALWARE_KWARGS
|
||||
)
|
||||
before = markings.remove_markings(before, ["modified"], [MARKING_IDS[0]])
|
||||
before = markings.remove_markings(before, [MARKING_IDS[0]], ["modified"])
|
||||
for m in before["granular_markings"]:
|
||||
assert m in after["granular_markings"]
|
||||
|
||||
|
|
@ -439,7 +439,7 @@ def test_remove_marking_mark_mutilple_selector_multiple_refs():
|
|||
],
|
||||
**MALWARE_KWARGS
|
||||
)
|
||||
before = markings.remove_markings(before, ["description", "modified"], [MARKING_IDS[0], MARKING_IDS[1]])
|
||||
before = markings.remove_markings(before, [MARKING_IDS[0], MARKING_IDS[1]], ["description", "modified"])
|
||||
assert "granular_markings" not in before
|
||||
|
||||
|
||||
|
|
@ -466,7 +466,7 @@ def test_remove_marking_mark_another_property_same_marking():
|
|||
],
|
||||
**MALWARE_KWARGS
|
||||
)
|
||||
before = markings.remove_markings(before, ["modified"], [MARKING_IDS[0]])
|
||||
before = markings.remove_markings(before, [MARKING_IDS[0]], ["modified"])
|
||||
for m in before["granular_markings"]:
|
||||
assert m in after["granular_markings"]
|
||||
|
||||
|
|
@ -481,7 +481,7 @@ def test_remove_marking_mark_same_property_same_marking():
|
|||
],
|
||||
**MALWARE_KWARGS
|
||||
)
|
||||
before = markings.remove_markings(before, ["description"], [MARKING_IDS[0]])
|
||||
before = markings.remove_markings(before, [MARKING_IDS[0]], ["description"])
|
||||
assert "granular_markings" not in before
|
||||
|
||||
|
||||
|
|
@ -489,7 +489,7 @@ def test_remove_no_markings():
|
|||
before = {
|
||||
"description": "test description",
|
||||
}
|
||||
after = markings.remove_markings(before, ["description"], ["marking-definition--1"])
|
||||
after = markings.remove_markings(before, ["marking-definition--1"], ["description"])
|
||||
assert before == after
|
||||
|
||||
|
||||
|
|
@ -498,7 +498,7 @@ def test_remove_marking_bad_selector():
|
|||
"description": "test description",
|
||||
}
|
||||
with pytest.raises(AssertionError):
|
||||
markings.remove_markings(before, ["title"], ["marking-definition--1", "marking-definition--2"])
|
||||
markings.remove_markings(before, ["marking-definition--1", "marking-definition--2"], ["title"])
|
||||
|
||||
|
||||
IS_MARKED_TEST_DATA = {
|
||||
|
|
@ -526,8 +526,8 @@ IS_MARKED_TEST_DATA = {
|
|||
@pytest.mark.parametrize("data", [IS_MARKED_TEST_DATA])
|
||||
def test_is_marked_smoke(data):
|
||||
"""Smoke test is_marked call does not fail."""
|
||||
assert markings.is_marked(data, ["description"])
|
||||
assert markings.is_marked(data, ["title"]) is False
|
||||
assert markings.is_marked(data, selectors=["description"])
|
||||
assert markings.is_marked(data, selectors=["title"]) is False
|
||||
|
||||
|
||||
@pytest.mark.parametrize("data,selector", [
|
||||
|
|
@ -548,40 +548,40 @@ def test_is_marked_smoke(data):
|
|||
def test_is_marked_invalid_selector(data, selector):
|
||||
"""Test invalid selector raises an error."""
|
||||
with pytest.raises(AssertionError):
|
||||
markings.is_marked(data, selector)
|
||||
markings.is_marked(data, selectors=selector)
|
||||
|
||||
|
||||
@pytest.mark.parametrize("data", [IS_MARKED_TEST_DATA])
|
||||
def test_is_marked_mix_selector(data):
|
||||
"""Test valid selector, one marked and one not marked returns True."""
|
||||
assert markings.is_marked(data, ["description", "revision"])
|
||||
assert markings.is_marked(data, ["description"])
|
||||
assert markings.is_marked(data, selectors=["description", "revision"])
|
||||
assert markings.is_marked(data, selectors=["description"])
|
||||
|
||||
|
||||
@pytest.mark.parametrize("data", [IS_MARKED_TEST_DATA])
|
||||
def test_is_marked_valid_selector_no_refs(data):
|
||||
"""Test that a valid selector return True when it has marking refs and False when not."""
|
||||
assert markings.is_marked(data, ["description"])
|
||||
assert markings.is_marked(data, ["description"], ["marking-definition--2", "marking-definition--3"])
|
||||
assert markings.is_marked(data, ["description"], ["marking-definition--2"])
|
||||
assert markings.is_marked(data, ["description"], ["marking-definition--2", "marking-definition--8"]) is False
|
||||
assert markings.is_marked(data, selectors=["description"])
|
||||
assert markings.is_marked(data, ["marking-definition--2", "marking-definition--3"], ["description"])
|
||||
assert markings.is_marked(data, ["marking-definition--2"], ["description"])
|
||||
assert markings.is_marked(data, ["marking-definition--2", "marking-definition--8"], ["description"]) is False
|
||||
|
||||
|
||||
@pytest.mark.parametrize("data", [IS_MARKED_TEST_DATA])
|
||||
def test_is_marked_valid_selector_and_refs(data):
|
||||
"""Test that a valid selector returns True when marking_refs match."""
|
||||
assert markings.is_marked(data, ["description"], ["marking-definition--1"])
|
||||
assert markings.is_marked(data, ["title"], ["marking-definition--1"]) is False
|
||||
assert markings.is_marked(data, ["marking-definition--1"], ["description"])
|
||||
assert markings.is_marked(data, ["marking-definition--1"], ["title"]) is False
|
||||
|
||||
|
||||
@pytest.mark.parametrize("data", [IS_MARKED_TEST_DATA])
|
||||
def test_is_marked_valid_selector_multiple_refs(data):
|
||||
"""Test that a valid selector returns True if aall marking_refs match.
|
||||
Otherwise False."""
|
||||
assert markings.is_marked(data, ["revision"], ["marking-definition--2", "marking-definition--3"])
|
||||
assert markings.is_marked(data, ["revision"], ["marking-definition--2", "marking-definition--1"]) is False
|
||||
assert markings.is_marked(data, ["revision"], "marking-definition--2")
|
||||
assert markings.is_marked(data, ["revision"], ["marking-definition--1234"]) is False
|
||||
assert markings.is_marked(data, ["marking-definition--2", "marking-definition--3"], ["revision"])
|
||||
assert markings.is_marked(data, ["marking-definition--2", "marking-definition--1"], ["revision"]) is False
|
||||
assert markings.is_marked(data, "marking-definition--2", ["revision"])
|
||||
assert markings.is_marked(data, ["marking-definition--1234"], ["revision"]) is False
|
||||
|
||||
|
||||
@pytest.mark.parametrize("data", [IS_MARKED_TEST_DATA])
|
||||
|
|
@ -589,8 +589,8 @@ def test_is_marked_no_marking_refs(data):
|
|||
"""Test that a valid content selector with no marking_refs returns True
|
||||
if there is a granular_marking that asserts that field, False
|
||||
otherwise."""
|
||||
assert markings.is_marked(data, ["type"]) is False
|
||||
assert markings.is_marked(data, ["revision"])
|
||||
assert markings.is_marked(data, selectors=["type"]) is False
|
||||
assert markings.is_marked(data, selectors=["revision"])
|
||||
|
||||
|
||||
def test_is_marked_positional_arguments_combinations():
|
||||
|
|
@ -661,75 +661,75 @@ def test_is_marked_positional_arguments_combinations():
|
|||
]
|
||||
}
|
||||
|
||||
assert markings.is_marked(test_sdo, "a", ["1"], False, False)
|
||||
assert markings.is_marked(test_sdo, "a", ["1"], True, False)
|
||||
assert markings.is_marked(test_sdo, "a", ["1"], True, True)
|
||||
assert markings.is_marked(test_sdo, "a", ["1"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["1"], "a", False, False)
|
||||
assert markings.is_marked(test_sdo, ["1"], "a", True, False)
|
||||
assert markings.is_marked(test_sdo, ["1"], "a", True, True)
|
||||
assert markings.is_marked(test_sdo, ["1"], "a", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "b", inherited=False, descendants=False) is False
|
||||
assert markings.is_marked(test_sdo, "b", inherited=True, descendants=False) is False
|
||||
assert markings.is_marked(test_sdo, "b", inherited=True, descendants=True) is False
|
||||
assert markings.is_marked(test_sdo, "b", inherited=False, descendants=True) is False
|
||||
|
||||
assert markings.is_marked(test_sdo, "c", ["2"], False, False)
|
||||
assert markings.is_marked(test_sdo, "c", ["2"], True, False)
|
||||
assert markings.is_marked(test_sdo, "c", ["2", "3", "4", "5"], True, True)
|
||||
assert markings.is_marked(test_sdo, "c", ["2", "3", "4", "5"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["2"], "c", False, False)
|
||||
assert markings.is_marked(test_sdo, ["2"], "c", True, False)
|
||||
assert markings.is_marked(test_sdo, ["2", "3", "4", "5"], "c", True, True)
|
||||
assert markings.is_marked(test_sdo, ["2", "3", "4", "5"], "c", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "c.[0]", inherited=False, descendants=False) is False
|
||||
assert markings.is_marked(test_sdo, "c.[0]", ["2"], True, False)
|
||||
assert markings.is_marked(test_sdo, "c.[0]", ["2"], True, True)
|
||||
assert markings.is_marked(test_sdo, ["2"], "c.[0]", True, False)
|
||||
assert markings.is_marked(test_sdo, ["2"], "c.[0]", True, True)
|
||||
assert markings.is_marked(test_sdo, "c.[0]", inherited=False, descendants=True) is False
|
||||
|
||||
assert markings.is_marked(test_sdo, "c.[1]", ["3"], False, False)
|
||||
assert markings.is_marked(test_sdo, "c.[1]", ["2", "3"], True, False)
|
||||
assert markings.is_marked(test_sdo, "c.[1]", ["2", "3"], True, True)
|
||||
assert markings.is_marked(test_sdo, "c.[1]", ["3"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["3"], "c.[1]", False, False)
|
||||
assert markings.is_marked(test_sdo, ["2", "3"], "c.[1]", True, False)
|
||||
assert markings.is_marked(test_sdo, ["2", "3"], "c.[1]", True, True)
|
||||
assert markings.is_marked(test_sdo, ["3"], "c.[1]", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "c.[2]", ["4"], False, False)
|
||||
assert markings.is_marked(test_sdo, "c.[2]", ["2", "4"], True, False)
|
||||
assert markings.is_marked(test_sdo, "c.[2]", ["2", "4", "5"], True, True)
|
||||
assert markings.is_marked(test_sdo, "c.[2]", ["4", "5"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["4"], "c.[2]", False, False)
|
||||
assert markings.is_marked(test_sdo, ["2", "4"], "c.[2]", True, False)
|
||||
assert markings.is_marked(test_sdo, ["2", "4", "5"], "c.[2]", True, True)
|
||||
assert markings.is_marked(test_sdo, ["4", "5"], "c.[2]", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "c.[2].g", ["5"], False, False)
|
||||
assert markings.is_marked(test_sdo, "c.[2].g", ["2", "4", "5"], True, False)
|
||||
assert markings.is_marked(test_sdo, "c.[2].g", ["2", "4", "5"], True, True)
|
||||
assert markings.is_marked(test_sdo, "c.[2].g", ["5"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["5"], "c.[2].g", False, False)
|
||||
assert markings.is_marked(test_sdo, ["2", "4", "5"], "c.[2].g", True, False)
|
||||
assert markings.is_marked(test_sdo, ["2", "4", "5"], "c.[2].g", True, True)
|
||||
assert markings.is_marked(test_sdo, ["5"], "c.[2].g", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "x", ["6"], False, False)
|
||||
assert markings.is_marked(test_sdo, "x", ["6"], True, False)
|
||||
assert markings.is_marked(test_sdo, "x", ["6", "7", "8", "9", "10"], True, True)
|
||||
assert markings.is_marked(test_sdo, "x", ["6", "7", "8", "9", "10"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["6"], "x", False, False)
|
||||
assert markings.is_marked(test_sdo, ["6"], "x", True, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "7", "8", "9", "10"], "x", True, True)
|
||||
assert markings.is_marked(test_sdo, ["6", "7", "8", "9", "10"], "x", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "x.y", ["7"], False, False)
|
||||
assert markings.is_marked(test_sdo, "x.y", ["6", "7"], True, False)
|
||||
assert markings.is_marked(test_sdo, "x.y", ["6", "7", "8"], True, True)
|
||||
assert markings.is_marked(test_sdo, "x.y", ["7", "8"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["7"], "x.y", False, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "7"], "x.y", True, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "7", "8"], "x.y", True, True)
|
||||
assert markings.is_marked(test_sdo, ["7", "8"], "x.y", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "x.y.[0]", inherited=False, descendants=False) is False
|
||||
assert markings.is_marked(test_sdo, "x.y.[0]", ["6", "7"], True, False)
|
||||
assert markings.is_marked(test_sdo, "x.y.[0]", ["6", "7"], True, True)
|
||||
assert markings.is_marked(test_sdo, ["6", "7"], "x.y.[0]", True, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "7"], "x.y.[0]", True, True)
|
||||
assert markings.is_marked(test_sdo, "x.y.[0]", inherited=False, descendants=True) is False
|
||||
|
||||
assert markings.is_marked(test_sdo, "x.y.[1]", ["8"], False, False)
|
||||
assert markings.is_marked(test_sdo, "x.y.[1]", ["6", "7", "8"], True, False)
|
||||
assert markings.is_marked(test_sdo, "x.y.[1]", ["6", "7", "8"], True, True)
|
||||
assert markings.is_marked(test_sdo, "x.y.[1]", ["8"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["8"], "x.y.[1]", False, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "7", "8"], "x.y.[1]", True, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "7", "8"], "x.y.[1]", True, True)
|
||||
assert markings.is_marked(test_sdo, ["8"], "x.y.[1]", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "x.z", ["9"], False, False)
|
||||
assert markings.is_marked(test_sdo, "x.z", ["6", "9"], True, False)
|
||||
assert markings.is_marked(test_sdo, "x.z", ["6", "9", "10"], True, True)
|
||||
assert markings.is_marked(test_sdo, "x.z", ["9", "10"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["9"], "x.z", False, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "9"], "x.z", True, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "9", "10"], "x.z", True, True)
|
||||
assert markings.is_marked(test_sdo, ["9", "10"], "x.z", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "x.z.foo1", inherited=False, descendants=False) is False
|
||||
assert markings.is_marked(test_sdo, "x.z.foo1", ["6", "9"], True, False)
|
||||
assert markings.is_marked(test_sdo, "x.z.foo1", ["6", "9"], True, True)
|
||||
assert markings.is_marked(test_sdo, ["6", "9"], "x.z.foo1", True, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "9"], "x.z.foo1", True, True)
|
||||
assert markings.is_marked(test_sdo, "x.z.foo1", inherited=False, descendants=True) is False
|
||||
|
||||
assert markings.is_marked(test_sdo, "x.z.foo2", ["10"], False, False)
|
||||
assert markings.is_marked(test_sdo, "x.z.foo2", ["6", "9", "10"], True, False)
|
||||
assert markings.is_marked(test_sdo, "x.z.foo2", ["6", "9", "10"], True, True)
|
||||
assert markings.is_marked(test_sdo, "x.z.foo2", ["10"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["10"], "x.z.foo2", False, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "9", "10"], "x.z.foo2", True, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "9", "10"], "x.z.foo2", True, True)
|
||||
assert markings.is_marked(test_sdo, ["10"], "x.z.foo2", False, True)
|
||||
|
||||
|
||||
def test_create_sdo_with_invalid_marking():
|
||||
|
|
@ -763,7 +763,7 @@ def test_set_marking_mark_one_selector_multiple_refs():
|
|||
],
|
||||
**MALWARE_KWARGS
|
||||
)
|
||||
before = markings.set_markings(before, ["description"], [MARKING_IDS[0], MARKING_IDS[1]])
|
||||
before = markings.set_markings(before, [MARKING_IDS[0], MARKING_IDS[1]], ["description"])
|
||||
for m in before["granular_markings"]:
|
||||
assert m in after["granular_markings"]
|
||||
|
||||
|
|
@ -787,7 +787,7 @@ def test_set_marking_mark_multiple_selector_one_refs():
|
|||
],
|
||||
**MALWARE_KWARGS
|
||||
)
|
||||
before = markings.set_markings(before, ["description", "modified"], [MARKING_IDS[0]])
|
||||
before = markings.set_markings(before, [MARKING_IDS[0]], ["description", "modified"])
|
||||
for m in before["granular_markings"]:
|
||||
assert m in after["granular_markings"]
|
||||
|
||||
|
|
@ -809,7 +809,7 @@ def test_set_marking_mark_multiple_selector_multiple_refs_from_none():
|
|||
],
|
||||
**MALWARE_KWARGS
|
||||
)
|
||||
before = markings.set_markings(before, ["description", "modified"], [MARKING_IDS[0], MARKING_IDS[1]])
|
||||
before = markings.set_markings(before, [MARKING_IDS[0], MARKING_IDS[1]], ["description", "modified"])
|
||||
for m in before["granular_markings"]:
|
||||
assert m in after["granular_markings"]
|
||||
|
||||
|
|
@ -837,17 +837,17 @@ def test_set_marking_mark_another_property_same_marking():
|
|||
],
|
||||
**MALWARE_KWARGS
|
||||
)
|
||||
before = markings.set_markings(before, ["description"], [MARKING_IDS[1], MARKING_IDS[2]])
|
||||
before = markings.set_markings(before, [MARKING_IDS[1], MARKING_IDS[2]], ["description"])
|
||||
|
||||
for m in before["granular_markings"]:
|
||||
assert m in after["granular_markings"]
|
||||
|
||||
|
||||
@pytest.mark.parametrize("marking", [
|
||||
(["foo"], [MARKING_IDS[4], MARKING_IDS[5]]),
|
||||
("", [MARKING_IDS[4], MARKING_IDS[5]]),
|
||||
([], [MARKING_IDS[4], MARKING_IDS[5]]),
|
||||
([""], [MARKING_IDS[4], MARKING_IDS[5]]),
|
||||
([MARKING_IDS[4], MARKING_IDS[5]], ["foo"]),
|
||||
([MARKING_IDS[4], MARKING_IDS[5]], ""),
|
||||
([MARKING_IDS[4], MARKING_IDS[5]], []),
|
||||
([MARKING_IDS[4], MARKING_IDS[5]], [""]),
|
||||
])
|
||||
def test_set_marking_bad_selector(marking):
|
||||
before = Malware(
|
||||
|
|
@ -894,7 +894,7 @@ def test_set_marking_mark_same_property_same_marking():
|
|||
],
|
||||
**MALWARE_KWARGS
|
||||
)
|
||||
before = markings.set_markings(before, ["description"], [MARKING_IDS[0]])
|
||||
before = markings.set_markings(before, [MARKING_IDS[0]], ["description"])
|
||||
for m in before["granular_markings"]:
|
||||
assert m in after["granular_markings"]
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import pytest
|
|||
import pytz
|
||||
|
||||
import stix2
|
||||
from stix2 import TLP_WHITE, markings
|
||||
from stix2 import TLP_WHITE
|
||||
|
||||
from .constants import MARKING_DEFINITION_ID
|
||||
|
||||
|
|
@ -156,8 +156,6 @@ def test_campaign_with_granular_markings_example():
|
|||
marking_ref="marking-definition--613f2e26-407d-48c7-9eca-b8e91df99dc9",
|
||||
selectors=["description"])
|
||||
])
|
||||
print(markings.get_markings(campaign, None))
|
||||
print(markings.add_markings(campaign, None, "marking-definition--00000000-0000-0000-0000-000000000000"))
|
||||
assert str(campaign) == EXPECTED_CAMPAIGN_WITH_GRANULAR_MARKINGS
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ def test_add_markings_one_marking():
|
|||
**MALWARE_KWARGS
|
||||
)
|
||||
|
||||
before = markings.add_markings(before, None, MARKING_IDS[0])
|
||||
before = markings.add_markings(before, MARKING_IDS[0], None)
|
||||
|
||||
for m in before["object_marking_refs"]:
|
||||
assert m in after["object_marking_refs"]
|
||||
|
|
@ -42,7 +42,7 @@ def test_add_markings_multiple_marking():
|
|||
**MALWARE_KWARGS
|
||||
)
|
||||
|
||||
before = markings.add_markings(before, None, [MARKING_IDS[0], MARKING_IDS[1]])
|
||||
before = markings.add_markings(before, [MARKING_IDS[0], MARKING_IDS[1]], None)
|
||||
|
||||
for m in before["object_marking_refs"]:
|
||||
assert m in after["object_marking_refs"]
|
||||
|
|
@ -67,10 +67,10 @@ def test_add_markings_combination():
|
|||
**MALWARE_KWARGS
|
||||
)
|
||||
|
||||
before = markings.add_markings(before, None, MARKING_IDS[0])
|
||||
before = markings.add_markings(before, None, MARKING_IDS[1])
|
||||
before = markings.add_markings(before, "labels", MARKING_IDS[2])
|
||||
before = markings.add_markings(before, "name", MARKING_IDS[3])
|
||||
before = markings.add_markings(before, MARKING_IDS[0], None)
|
||||
before = markings.add_markings(before, MARKING_IDS[1], None)
|
||||
before = markings.add_markings(before, MARKING_IDS[2], "labels")
|
||||
before = markings.add_markings(before, MARKING_IDS[3], "name")
|
||||
|
||||
for m in before["granular_markings"]:
|
||||
assert m in after["granular_markings"]
|
||||
|
|
@ -90,7 +90,7 @@ def test_add_markings_bad_markings(data):
|
|||
**MALWARE_KWARGS
|
||||
)
|
||||
with pytest.raises(exceptions.InvalidValueError):
|
||||
before = markings.add_markings(before, None, data)
|
||||
before = markings.add_markings(before, data, None)
|
||||
|
||||
assert "object_marking_refs" not in before
|
||||
|
||||
|
|
@ -251,13 +251,13 @@ def test_remove_markings_object_level():
|
|||
**MALWARE_KWARGS
|
||||
)
|
||||
|
||||
before = markings.remove_markings(before, None, MARKING_IDS[0])
|
||||
before = markings.remove_markings(before, MARKING_IDS[0], None)
|
||||
|
||||
assert 'object_marking_refs' not in before
|
||||
assert 'object_marking_refs' not in after
|
||||
|
||||
modified = after.modified
|
||||
after = markings.remove_markings(after, None, MARKING_IDS[0])
|
||||
after = markings.remove_markings(after, MARKING_IDS[0], None)
|
||||
modified == after.modified
|
||||
|
||||
|
||||
|
|
@ -271,7 +271,7 @@ def test_remove_markings_multiple():
|
|||
**MALWARE_KWARGS
|
||||
)
|
||||
|
||||
before = markings.remove_markings(before, None, [MARKING_IDS[0], MARKING_IDS[2]])
|
||||
before = markings.remove_markings(before, [MARKING_IDS[0], MARKING_IDS[2]], None)
|
||||
|
||||
assert before['object_marking_refs'] == after['object_marking_refs']
|
||||
|
||||
|
|
@ -282,7 +282,7 @@ def test_remove_markings_bad_markings():
|
|||
**MALWARE_KWARGS
|
||||
)
|
||||
with pytest.raises(AssertionError) as excinfo:
|
||||
markings.remove_markings(before, None, [MARKING_IDS[4]])
|
||||
markings.remove_markings(before, [MARKING_IDS[4]], None)
|
||||
assert str(excinfo.value) == "Marking ['%s'] was not found in Malware!" % MARKING_IDS[4]
|
||||
|
||||
|
||||
|
|
@ -370,78 +370,78 @@ def test_is_marked_object_and_granular_combinations():
|
|||
]
|
||||
}
|
||||
|
||||
assert markings.is_marked(test_sdo, "a", ["1"], False, False)
|
||||
assert markings.is_marked(test_sdo, "a", ["1", "11"], True, False)
|
||||
assert markings.is_marked(test_sdo, "a", ["1", "11"], True, True)
|
||||
assert markings.is_marked(test_sdo, "a", ["1"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["1"], "a", False, False)
|
||||
assert markings.is_marked(test_sdo, ["1", "11"], "a", True, False)
|
||||
assert markings.is_marked(test_sdo, ["1", "11"], "a", True, True)
|
||||
assert markings.is_marked(test_sdo, ["1"], "a", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "b", inherited=False, descendants=False) is False
|
||||
assert markings.is_marked(test_sdo, "b", ["11"], True, False)
|
||||
assert markings.is_marked(test_sdo, "b", ["11"], True, True)
|
||||
assert markings.is_marked(test_sdo, ["11"], "b", True, False)
|
||||
assert markings.is_marked(test_sdo, ["11"], "b", True, True)
|
||||
assert markings.is_marked(test_sdo, "b", inherited=False, descendants=True) is False
|
||||
|
||||
assert markings.is_marked(test_sdo, "c", ["2"], False, False)
|
||||
assert markings.is_marked(test_sdo, "c", ["2", "11"], True, False)
|
||||
assert markings.is_marked(test_sdo, "c", ["2", "3", "4", "5", "11"], True, True)
|
||||
assert markings.is_marked(test_sdo, "c", ["2", "3", "4", "5"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["2"], "c", False, False)
|
||||
assert markings.is_marked(test_sdo, ["2", "11"], "c", True, False)
|
||||
assert markings.is_marked(test_sdo, ["2", "3", "4", "5", "11"], "c", True, True)
|
||||
assert markings.is_marked(test_sdo, ["2", "3", "4", "5"], "c", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "c.[0]", inherited=False, descendants=False) is False
|
||||
assert markings.is_marked(test_sdo, "c.[0]", ["2", "11"], True, False)
|
||||
assert markings.is_marked(test_sdo, "c.[0]", ["2", "11"], True, True)
|
||||
assert markings.is_marked(test_sdo, ["2", "11"], "c.[0]", True, False)
|
||||
assert markings.is_marked(test_sdo, ["2", "11"], "c.[0]", True, True)
|
||||
assert markings.is_marked(test_sdo, "c.[0]", inherited=False, descendants=True) is False
|
||||
|
||||
assert markings.is_marked(test_sdo, "c.[1]", ["3"], False, False)
|
||||
assert markings.is_marked(test_sdo, "c.[1]", ["2", "3", "11"], True, False)
|
||||
assert markings.is_marked(test_sdo, "c.[1]", ["2", "3", "11"], True, True)
|
||||
assert markings.is_marked(test_sdo, "c.[1]", ["3"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["3"], "c.[1]", False, False)
|
||||
assert markings.is_marked(test_sdo, ["2", "3", "11"], "c.[1]", True, False)
|
||||
assert markings.is_marked(test_sdo, ["2", "3", "11"], "c.[1]", True, True)
|
||||
assert markings.is_marked(test_sdo, ["3"], "c.[1]", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "c.[2]", ["4"], False, False)
|
||||
assert markings.is_marked(test_sdo, "c.[2]", ["2", "4", "11"], True, False)
|
||||
assert markings.is_marked(test_sdo, "c.[2]", ["2", "4", "5", "11"], True, True)
|
||||
assert markings.is_marked(test_sdo, "c.[2]", ["4", "5"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["4"], "c.[2]", False, False)
|
||||
assert markings.is_marked(test_sdo, ["2", "4", "11"], "c.[2]", True, False)
|
||||
assert markings.is_marked(test_sdo, ["2", "4", "5", "11"], "c.[2]", True, True)
|
||||
assert markings.is_marked(test_sdo, ["4", "5"], "c.[2]", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "c.[2].g", ["5"], False, False)
|
||||
assert markings.is_marked(test_sdo, "c.[2].g", ["2", "4", "5", "11"], True, False)
|
||||
assert markings.is_marked(test_sdo, "c.[2].g", ["2", "4", "5", "11"], True, True)
|
||||
assert markings.is_marked(test_sdo, "c.[2].g", ["5"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["5"], "c.[2].g", False, False)
|
||||
assert markings.is_marked(test_sdo, ["2", "4", "5", "11"], "c.[2].g", True, False)
|
||||
assert markings.is_marked(test_sdo, ["2", "4", "5", "11"], "c.[2].g", True, True)
|
||||
assert markings.is_marked(test_sdo, ["5"], "c.[2].g", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "x", ["6"], False, False)
|
||||
assert markings.is_marked(test_sdo, "x", ["6", "11"], True, False)
|
||||
assert markings.is_marked(test_sdo, "x", ["6", "7", "8", "9", "10", "11"], True, True)
|
||||
assert markings.is_marked(test_sdo, "x", ["6", "7", "8", "9", "10"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["6"], "x", False, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "11"], "x", True, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "7", "8", "9", "10", "11"], "x", True, True)
|
||||
assert markings.is_marked(test_sdo, ["6", "7", "8", "9", "10"], "x", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "x.y", ["7"], False, False)
|
||||
assert markings.is_marked(test_sdo, "x.y", ["6", "7", "11"], True, False)
|
||||
assert markings.is_marked(test_sdo, "x.y", ["6", "7", "8", "11"], True, True)
|
||||
assert markings.is_marked(test_sdo, "x.y", ["7", "8"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["7"], "x.y", False, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "7", "11"], "x.y", True, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "7", "8", "11"], "x.y", True, True)
|
||||
assert markings.is_marked(test_sdo, ["7", "8"], "x.y", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "x.y.[0]", inherited=False, descendants=False) is False
|
||||
assert markings.is_marked(test_sdo, "x.y.[0]", ["6", "7", "11"], True, False)
|
||||
assert markings.is_marked(test_sdo, "x.y.[0]", ["6", "7", "11"], True, True)
|
||||
assert markings.is_marked(test_sdo, ["6", "7", "11"], "x.y.[0]", True, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "7", "11"], "x.y.[0]", True, True)
|
||||
assert markings.is_marked(test_sdo, "x.y.[0]", inherited=False, descendants=True) is False
|
||||
|
||||
assert markings.is_marked(test_sdo, "x.y.[1]", ["8"], False, False)
|
||||
assert markings.is_marked(test_sdo, "x.y.[1]", ["6", "7", "8", "11"], True, False)
|
||||
assert markings.is_marked(test_sdo, "x.y.[1]", ["6", "7", "8", "11"], True, True)
|
||||
assert markings.is_marked(test_sdo, "x.y.[1]", ["8"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["8"], "x.y.[1]", False, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "7", "8", "11"], "x.y.[1]", True, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "7", "8", "11"], "x.y.[1]", True, True)
|
||||
assert markings.is_marked(test_sdo, ["8"], "x.y.[1]", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "x.z", ["9"], False, False)
|
||||
assert markings.is_marked(test_sdo, "x.z", ["6", "9", "11"], True, False)
|
||||
assert markings.is_marked(test_sdo, "x.z", ["6", "9", "10", "11"], True, True)
|
||||
assert markings.is_marked(test_sdo, "x.z", ["9", "10"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["9"], "x.z", False, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "9", "11"], "x.z", True, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "9", "10", "11"], "x.z", True, True)
|
||||
assert markings.is_marked(test_sdo, ["9", "10"], "x.z", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, "x.z.foo1", inherited=False, descendants=False) is False
|
||||
assert markings.is_marked(test_sdo, "x.z.foo1", ["6", "9", "11"], True, False)
|
||||
assert markings.is_marked(test_sdo, "x.z.foo1", ["6", "9", "11"], True, True)
|
||||
assert markings.is_marked(test_sdo, ["6", "9", "11"], "x.z.foo1", True, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "9", "11"], "x.z.foo1", True, True)
|
||||
assert markings.is_marked(test_sdo, "x.z.foo1", inherited=False, descendants=True) is False
|
||||
|
||||
assert markings.is_marked(test_sdo, "x.z.foo2", ["10"], False, False)
|
||||
assert markings.is_marked(test_sdo, "x.z.foo2", ["6", "9", "10", "11"], True, False)
|
||||
assert markings.is_marked(test_sdo, "x.z.foo2", ["6", "9", "10", "11"], True, True)
|
||||
assert markings.is_marked(test_sdo, "x.z.foo2", ["10"], False, True)
|
||||
assert markings.is_marked(test_sdo, ["10"], "x.z.foo2", False, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "9", "10", "11"], "x.z.foo2", True, False)
|
||||
assert markings.is_marked(test_sdo, ["6", "9", "10", "11"], "x.z.foo2", True, True)
|
||||
assert markings.is_marked(test_sdo, ["10"], "x.z.foo2", False, True)
|
||||
|
||||
assert markings.is_marked(test_sdo, None, ["11"], True, True)
|
||||
assert markings.is_marked(test_sdo, None, ["2"], True, True) is False
|
||||
assert markings.is_marked(test_sdo, ["11"], None, True, True)
|
||||
assert markings.is_marked(test_sdo, ["2"], None, True, True) is False
|
||||
|
||||
|
||||
def test_set_marking():
|
||||
|
|
@ -454,7 +454,7 @@ def test_set_marking():
|
|||
**MALWARE_KWARGS
|
||||
)
|
||||
|
||||
before = markings.set_markings(before, None, [MARKING_IDS[4], MARKING_IDS[5]])
|
||||
before = markings.set_markings(before, [MARKING_IDS[4], MARKING_IDS[5]], None)
|
||||
|
||||
for m in before["object_marking_refs"]:
|
||||
assert m in [MARKING_IDS[4], MARKING_IDS[5]]
|
||||
|
|
@ -481,6 +481,6 @@ def test_set_marking_bad_input(data):
|
|||
**MALWARE_KWARGS
|
||||
)
|
||||
with pytest.raises(exceptions.InvalidValueError):
|
||||
before = markings.set_markings(before, None, data)
|
||||
before = markings.set_markings(before, data, None)
|
||||
|
||||
assert before == after
|
||||
|
|
|
|||
Loading…
Reference in New Issue