MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

Fix tests. Fixes #307

master
Desai, Kartikey H 2020-01-03 14:34:59 -05:00 committed by Chris Lenk
parent 7a47f348a0
commit d50792b4d2
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
stix2/test/v20/test_indicator.py
View File

@ -197,6 +197,7 @@ def test_invalid_indicator_pattern():
def test_indicator_stix21_invalid_pattern(): def test_indicator_stix21_invalid_pattern():
now = dt.datetime(2017, 1, 1, 0, 0, 1, tzinfo=pytz.utc) now = dt.datetime(2017, 1, 1, 0, 0, 1, tzinfo=pytz.utc)
epoch = dt.datetime(1970, 1, 1, 0, 0, 1, tzinfo=pytz.utc) epoch = dt.datetime(1970, 1, 1, 0, 0, 1, tzinfo=pytz.utc)
patrn = "[EXISTS windows-registry-key:values]"
with pytest.raises(stix2.exceptions.InvalidValueError) as excinfo: with pytest.raises(stix2.exceptions.InvalidValueError) as excinfo:
stix2.v20.Indicator( stix2.v20.Indicator(
@ -204,7 +205,7 @@ def test_indicator_stix21_invalid_pattern():
id=INDICATOR_ID, id=INDICATOR_ID,
created=now, created=now,
modified=now, modified=now,
pattern="[EXISTS windows-registry-key:values]", pattern=patrn,
valid_from=epoch, valid_from=epoch,
labels=["malicious-activity"], labels=["malicious-activity"],
) )

21
stix2/test/v21/test_indicator.py
View File

@ -256,6 +256,7 @@ def test_indicator_with_custom_embed_objs_extra_props_error():
def test_indicator_stix20_invalid_pattern(): def test_indicator_stix20_invalid_pattern():
now = dt.datetime(2017, 1, 1, 0, 0, 1, tzinfo=pytz.utc) now = dt.datetime(2017, 1, 1, 0, 0, 1, tzinfo=pytz.utc)
epoch = dt.datetime(1970, 1, 1, 0, 0, 1, tzinfo=pytz.utc) epoch = dt.datetime(1970, 1, 1, 0, 0, 1, tzinfo=pytz.utc)
patrn = "[win-registry-key:key = 'hkey_local_machine\\\\foo\\\\bar'] WITHIN 5 SECONDS WITHIN 6 SECONDS"
with pytest.raises(stix2.exceptions.InvalidValueError) as excinfo: with pytest.raises(stix2.exceptions.InvalidValueError) as excinfo:
stix2.v21.Indicator( stix2.v21.Indicator(
@ -263,7 +264,7 @@ def test_indicator_stix20_invalid_pattern():
id=INDICATOR_ID, id=INDICATOR_ID,
created=now, created=now,
modified=now, modified=now,
pattern="[win-registry-key:key = 'hkey_local_machine\\\\foo\\\\bar'] WITHIN 5 SECONDS WITHIN 6 SECONDS", pattern=patrn,
pattern_type="stix", pattern_type="stix",
valid_from=epoch, valid_from=epoch,
indicator_types=['malicious-activity'], indicator_types=['malicious-activity'],
@ -271,3 +272,21 @@ def test_indicator_stix20_invalid_pattern():
assert excinfo.value.cls == stix2.v21.Indicator assert excinfo.value.cls == stix2.v21.Indicator
assert "FAIL: The same qualifier is used more than once" in str(excinfo.value) assert "FAIL: The same qualifier is used more than once" in str(excinfo.value)
ind = stix2.v21.Indicator(
type="indicator",
id=INDICATOR_ID,
created=now,
modified=now,
pattern=patrn,
pattern_type="stix",
pattern_version="2.0",
valid_from=epoch,
indicator_types=['malicious-activity'],
)
assert ind.id == INDICATOR_ID
assert ind.indicator_types == ['malicious-activity']
assert ind.pattern == patrn
assert ind.pattern_type == "stix"
assert ind.pattern_version == "2.0"