2017-04-25 00:29:56 +02:00
|
|
|
import datetime as dt
|
2017-05-03 23:35:33 +02:00
|
|
|
import re
|
2017-04-25 00:29:56 +02:00
|
|
|
|
2017-04-19 15:22:08 +02:00
|
|
|
import pytest
|
|
|
|
import pytz
|
2017-05-09 21:10:53 +02:00
|
|
|
|
2017-02-24 18:56:55 +01:00
|
|
|
import stix2
|
|
|
|
|
Improved the exception class hierarchy:
- Removed all plain python base classes (e.g. ValueError, TypeError)
- Renamed InvalidPropertyConfigurationError -> PropertyPresenceError,
since incorrect values could be considered a property config error, and
I really just wanted this class to apply to presence (co-)constraint
violations.
- Added ObjectConfigurationError as a superclass of InvalidValueError,
PropertyPresenceError, and any other exception that could be raised
during _STIXBase object init, which is when the spec compliance
checks happen. This class is intended to represent general spec
violations.
- Did some class reordering in exceptions.py, so all the
ObjectConfigurationError subclasses were together.
Changed how property "cleaning" errors were handled:
- Previous docs said they should all be ValueErrors, but that would require
extra exception check-and-replace complexity in the property
implementations, so that requirement is removed. Doc is changed to just
say that cleaning problems should cause exceptions to be raised.
_STIXBase._check_property() now handles most exception types, not just
ValueError.
- Decided to try chaining the original clean error to the InvalidValueError,
in case the extra diagnostics would be helpful in the future. This is
done via 'six' adapter function and only works on python3.
- A small amount of testing was removed, since it was looking at custom
exception properties which became unavailable once the exception was
replaced with InvalidValueError.
Did another pass through unit tests to fix breakage caused by the changed
exception class hierarchy.
Removed unnecessary observable extension handling code from
parse_observable(), since it was all duplicated in ExtensionsProperty.
The redundant code in parse_observable() had different exception behavior
than ExtensionsProperty, which makes the API inconsistent and unit tests
more complicated. (Problems in ExtensionsProperty get replaced with
InvalidValueError, but extensions problems handled directly in
parse_observable() don't get the same replacement, and so the exception
type is different.)
Redid the workbench monkeypatching. The old way was impossible to make
work, and had caused ugly ripple effect hackage in other parts of the
codebase. Now, it replaces the global object maps with factory functions
which behave the same way when called, as real classes. Had to fix up a
few unit tests to get them all passing with this monkeypatching in place.
Also remove all the xfail markings in the workbench test suite, since all
tests now pass.
Since workbench monkeypatching isn't currently affecting any unit tests,
tox.ini was simplified to remove the special-casing for running the
workbench tests.
Removed the v20 workbench test suite, since the workbench currently only
works with the latest stix object version.
2019-07-19 20:50:11 +02:00
|
|
|
from ...exceptions import InvalidValueError
|
2019-01-29 16:52:59 +01:00
|
|
|
from .constants import IDENTITY_ID, OBSERVED_DATA_ID
|
2017-05-09 21:10:53 +02:00
|
|
|
|
2017-08-29 21:15:32 +02:00
|
|
|
OBJECTS_REGEX = re.compile('\"objects\": {(?:.*?)(?:(?:[^{]*?)|(?:{[^{]*?}))*}', re.DOTALL)
|
|
|
|
|
2017-04-19 15:22:08 +02:00
|
|
|
|
2017-02-24 18:56:55 +01:00
|
|
|
EXPECTED = """{
|
2017-08-15 19:41:51 +02:00
|
|
|
"type": "observed-data",
|
|
|
|
"id": "observed-data--b67d30ff-02ac-498a-92f9-32f845f448cf",
|
2019-01-29 16:52:59 +01:00
|
|
|
"created_by_ref": "identity--311b2d2d-f010-4473-83ec-1edf84858f4c",
|
2017-08-15 19:41:51 +02:00
|
|
|
"created": "2016-04-06T19:58:16.000Z",
|
|
|
|
"modified": "2016-04-06T19:58:16.000Z",
|
2017-02-24 18:56:55 +01:00
|
|
|
"first_observed": "2015-12-21T19:00:00Z",
|
|
|
|
"last_observed": "2015-12-21T19:00:00Z",
|
|
|
|
"number_observed": 50,
|
|
|
|
"objects": {
|
|
|
|
"0": {
|
2017-08-15 19:41:51 +02:00
|
|
|
"type": "file",
|
|
|
|
"name": "foo.exe"
|
2017-02-24 18:56:55 +01:00
|
|
|
}
|
2017-08-15 19:41:51 +02:00
|
|
|
}
|
2017-02-24 18:56:55 +01:00
|
|
|
}"""
|
|
|
|
|
|
|
|
|
|
|
|
def test_observed_data_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
observed_data = stix2.v20.ObservedData(
|
2019-01-23 05:07:20 +01:00
|
|
|
id=OBSERVED_DATA_ID,
|
2019-01-29 16:52:59 +01:00
|
|
|
created_by_ref=IDENTITY_ID,
|
2017-06-23 00:47:35 +02:00
|
|
|
created="2016-04-06T19:58:16.000Z",
|
|
|
|
modified="2016-04-06T19:58:16.000Z",
|
2017-02-24 18:56:55 +01:00
|
|
|
first_observed="2015-12-21T19:00:00Z",
|
|
|
|
last_observed="2015-12-21T19:00:00Z",
|
|
|
|
number_observed=50,
|
|
|
|
objects={
|
|
|
|
"0": {
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
"name": "foo.exe",
|
2018-07-13 17:10:05 +02:00
|
|
|
"type": "file",
|
2017-02-24 18:56:55 +01:00
|
|
|
},
|
|
|
|
},
|
|
|
|
)
|
|
|
|
|
|
|
|
assert str(observed_data) == EXPECTED
|
|
|
|
|
2017-04-19 15:22:08 +02:00
|
|
|
|
2017-05-09 03:03:15 +02:00
|
|
|
EXPECTED_WITH_REF = """{
|
2017-08-15 19:41:51 +02:00
|
|
|
"type": "observed-data",
|
|
|
|
"id": "observed-data--b67d30ff-02ac-498a-92f9-32f845f448cf",
|
2019-01-29 16:52:59 +01:00
|
|
|
"created_by_ref": "identity--311b2d2d-f010-4473-83ec-1edf84858f4c",
|
2017-08-15 19:41:51 +02:00
|
|
|
"created": "2016-04-06T19:58:16.000Z",
|
|
|
|
"modified": "2016-04-06T19:58:16.000Z",
|
2017-05-09 03:03:15 +02:00
|
|
|
"first_observed": "2015-12-21T19:00:00Z",
|
|
|
|
"last_observed": "2015-12-21T19:00:00Z",
|
|
|
|
"number_observed": 50,
|
|
|
|
"objects": {
|
|
|
|
"0": {
|
2017-08-15 19:41:51 +02:00
|
|
|
"type": "file",
|
|
|
|
"name": "foo.exe"
|
2017-05-09 03:03:15 +02:00
|
|
|
},
|
|
|
|
"1": {
|
2017-08-15 19:41:51 +02:00
|
|
|
"type": "directory",
|
|
|
|
"path": "/usr/home",
|
2017-05-09 03:03:15 +02:00
|
|
|
"contains_refs": [
|
|
|
|
"0"
|
2017-08-15 19:41:51 +02:00
|
|
|
]
|
2017-05-09 03:03:15 +02:00
|
|
|
}
|
2017-08-15 19:41:51 +02:00
|
|
|
}
|
2017-05-09 03:03:15 +02:00
|
|
|
}"""
|
|
|
|
|
|
|
|
|
|
|
|
def test_observed_data_example_with_refs():
|
2018-07-05 21:23:25 +02:00
|
|
|
observed_data = stix2.v20.ObservedData(
|
2019-01-23 05:07:20 +01:00
|
|
|
id=OBSERVED_DATA_ID,
|
2019-01-29 16:52:59 +01:00
|
|
|
created_by_ref=IDENTITY_ID,
|
2017-06-23 00:47:35 +02:00
|
|
|
created="2016-04-06T19:58:16.000Z",
|
|
|
|
modified="2016-04-06T19:58:16.000Z",
|
2017-05-09 03:03:15 +02:00
|
|
|
first_observed="2015-12-21T19:00:00Z",
|
|
|
|
last_observed="2015-12-21T19:00:00Z",
|
|
|
|
number_observed=50,
|
|
|
|
objects={
|
|
|
|
"0": {
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
"name": "foo.exe",
|
2018-07-13 17:10:05 +02:00
|
|
|
"type": "file",
|
2017-05-09 03:03:15 +02:00
|
|
|
},
|
|
|
|
"1": {
|
|
|
|
"type": "directory",
|
|
|
|
"path": "/usr/home",
|
2018-07-13 17:10:05 +02:00
|
|
|
"contains_refs": ["0"],
|
|
|
|
},
|
2017-05-09 03:03:15 +02:00
|
|
|
},
|
|
|
|
)
|
|
|
|
|
|
|
|
assert str(observed_data) == EXPECTED_WITH_REF
|
|
|
|
|
|
|
|
|
|
|
|
def test_observed_data_example_with_bad_refs():
|
|
|
|
with pytest.raises(stix2.exceptions.InvalidValueError) as excinfo:
|
2018-07-05 21:23:25 +02:00
|
|
|
stix2.v20.ObservedData(
|
2019-01-23 05:07:20 +01:00
|
|
|
id=OBSERVED_DATA_ID,
|
2019-01-29 16:52:59 +01:00
|
|
|
created_by_ref=IDENTITY_ID,
|
2017-06-23 00:47:35 +02:00
|
|
|
created="2016-04-06T19:58:16.000Z",
|
|
|
|
modified="2016-04-06T19:58:16.000Z",
|
2017-05-09 03:03:15 +02:00
|
|
|
first_observed="2015-12-21T19:00:00Z",
|
|
|
|
last_observed="2015-12-21T19:00:00Z",
|
|
|
|
number_observed=50,
|
|
|
|
objects={
|
|
|
|
"0": {
|
|
|
|
"type": "file",
|
2018-07-13 17:10:05 +02:00
|
|
|
"name": "foo.exe",
|
2017-05-09 03:03:15 +02:00
|
|
|
},
|
|
|
|
"1": {
|
|
|
|
"type": "directory",
|
|
|
|
"path": "/usr/home",
|
2018-07-13 17:10:05 +02:00
|
|
|
"contains_refs": ["2"],
|
|
|
|
},
|
2017-05-09 03:03:15 +02:00
|
|
|
},
|
|
|
|
)
|
|
|
|
|
2018-07-05 21:23:25 +02:00
|
|
|
assert excinfo.value.cls == stix2.v20.ObservedData
|
2017-05-09 03:03:15 +02:00
|
|
|
assert excinfo.value.prop_name == "objects"
|
|
|
|
assert excinfo.value.reason == "Invalid object reference for 'Directory:contains_refs': '2' is not a valid object in local scope"
|
|
|
|
|
|
|
|
|
2017-08-24 23:53:43 +02:00
|
|
|
def test_observed_data_example_with_non_dictionary():
|
|
|
|
with pytest.raises(stix2.exceptions.InvalidValueError) as excinfo:
|
2018-07-05 21:23:25 +02:00
|
|
|
stix2.v20.ObservedData(
|
2019-01-23 05:07:20 +01:00
|
|
|
id=OBSERVED_DATA_ID,
|
2019-01-29 16:52:59 +01:00
|
|
|
created_by_ref=IDENTITY_ID,
|
2017-08-24 23:53:43 +02:00
|
|
|
created="2016-04-06T19:58:16.000Z",
|
|
|
|
modified="2016-04-06T19:58:16.000Z",
|
|
|
|
first_observed="2015-12-21T19:00:00Z",
|
|
|
|
last_observed="2015-12-21T19:00:00Z",
|
|
|
|
number_observed=50,
|
|
|
|
objects="file: foo.exe",
|
|
|
|
)
|
|
|
|
|
2018-07-05 21:23:25 +02:00
|
|
|
assert excinfo.value.cls == stix2.v20.ObservedData
|
2017-08-24 23:53:43 +02:00
|
|
|
assert excinfo.value.prop_name == "objects"
|
|
|
|
assert 'must contain a dictionary' in excinfo.value.reason
|
|
|
|
|
|
|
|
|
|
|
|
def test_observed_data_example_with_empty_dictionary():
|
|
|
|
with pytest.raises(stix2.exceptions.InvalidValueError) as excinfo:
|
2018-07-05 21:23:25 +02:00
|
|
|
stix2.v20.ObservedData(
|
2019-01-23 05:07:20 +01:00
|
|
|
id=OBSERVED_DATA_ID,
|
2019-01-29 16:52:59 +01:00
|
|
|
created_by_ref=IDENTITY_ID,
|
2017-08-24 23:53:43 +02:00
|
|
|
created="2016-04-06T19:58:16.000Z",
|
|
|
|
modified="2016-04-06T19:58:16.000Z",
|
|
|
|
first_observed="2015-12-21T19:00:00Z",
|
|
|
|
last_observed="2015-12-21T19:00:00Z",
|
|
|
|
number_observed=50,
|
|
|
|
objects={},
|
|
|
|
)
|
|
|
|
|
2018-07-05 21:23:25 +02:00
|
|
|
assert excinfo.value.cls == stix2.v20.ObservedData
|
2017-08-24 23:53:43 +02:00
|
|
|
assert excinfo.value.prop_name == "objects"
|
|
|
|
assert 'must contain a non-empty dictionary' in excinfo.value.reason
|
|
|
|
|
|
|
|
|
2018-07-13 17:10:05 +02:00
|
|
|
@pytest.mark.parametrize(
|
|
|
|
"data", [
|
|
|
|
EXPECTED,
|
|
|
|
{
|
|
|
|
"type": "observed-data",
|
2019-01-23 05:07:20 +01:00
|
|
|
"id": OBSERVED_DATA_ID,
|
2018-07-13 17:10:05 +02:00
|
|
|
"created": "2016-04-06T19:58:16.000Z",
|
2019-01-29 16:52:59 +01:00
|
|
|
"created_by_ref": IDENTITY_ID,
|
2018-07-13 17:10:05 +02:00
|
|
|
"first_observed": "2015-12-21T19:00:00Z",
|
|
|
|
"last_observed": "2015-12-21T19:00:00Z",
|
|
|
|
"modified": "2016-04-06T19:58:16.000Z",
|
|
|
|
"number_observed": 50,
|
|
|
|
"objects": {
|
|
|
|
"0": {
|
|
|
|
"name": "foo.exe",
|
|
|
|
"type": "file",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
],
|
|
|
|
)
|
2017-04-19 15:22:08 +02:00
|
|
|
def test_parse_observed_data(data):
|
2018-07-05 21:23:25 +02:00
|
|
|
odata = stix2.parse(data, version="2.0")
|
2017-04-19 15:22:08 +02:00
|
|
|
|
|
|
|
assert odata.type == 'observed-data'
|
|
|
|
assert odata.id == OBSERVED_DATA_ID
|
|
|
|
assert odata.created == dt.datetime(2016, 4, 6, 19, 58, 16, tzinfo=pytz.utc)
|
|
|
|
assert odata.modified == dt.datetime(2016, 4, 6, 19, 58, 16, tzinfo=pytz.utc)
|
|
|
|
assert odata.first_observed == dt.datetime(2015, 12, 21, 19, 0, 0, tzinfo=pytz.utc)
|
|
|
|
assert odata.last_observed == dt.datetime(2015, 12, 21, 19, 0, 0, tzinfo=pytz.utc)
|
2019-01-29 16:52:59 +01:00
|
|
|
assert odata.created_by_ref == IDENTITY_ID
|
2017-05-03 23:35:33 +02:00
|
|
|
assert odata.objects["0"].type == "file"
|
|
|
|
|
|
|
|
|
2018-07-13 17:10:05 +02:00
|
|
|
@pytest.mark.parametrize(
|
|
|
|
"data", [
|
|
|
|
""""0": {
|
2017-05-03 23:35:33 +02:00
|
|
|
"type": "artifact",
|
|
|
|
"mime_type": "image/jpeg",
|
|
|
|
"payload_bin": "VBORw0KGgoAAAANSUhEUgAAADI=="
|
|
|
|
}""",
|
2018-07-13 17:10:05 +02:00
|
|
|
""""0": {
|
2017-05-03 23:35:33 +02:00
|
|
|
"type": "artifact",
|
|
|
|
"mime_type": "image/jpeg",
|
|
|
|
"url": "https://upload.wikimedia.org/wikipedia/commons/b/b4/JPEG_example_JPG_RIP_100.jpg",
|
|
|
|
"hashes": {
|
|
|
|
"MD5": "6826f9a05da08134006557758bb3afbb"
|
|
|
|
}
|
|
|
|
}""",
|
2018-07-13 17:10:05 +02:00
|
|
|
],
|
|
|
|
)
|
2017-05-03 23:35:33 +02:00
|
|
|
def test_parse_artifact_valid(data):
|
2017-08-29 21:15:32 +02:00
|
|
|
odata_str = OBJECTS_REGEX.sub('"objects": { %s }' % data, EXPECTED)
|
2018-07-05 21:23:25 +02:00
|
|
|
odata = stix2.parse(odata_str, version="2.0")
|
2017-05-03 23:35:33 +02:00
|
|
|
assert odata.objects["0"].type == "artifact"
|
|
|
|
|
|
|
|
|
2018-07-13 17:10:05 +02:00
|
|
|
@pytest.mark.parametrize(
|
|
|
|
"data", [
|
|
|
|
""""0": {
|
2017-05-03 23:35:33 +02:00
|
|
|
"type": "artifact",
|
|
|
|
"mime_type": "image/jpeg",
|
|
|
|
"payload_bin": "abcVBORw0KGgoAAAANSUhEUgAAADI=="
|
|
|
|
}""",
|
2018-07-13 17:10:05 +02:00
|
|
|
""""0": {
|
2017-05-03 23:35:33 +02:00
|
|
|
"type": "artifact",
|
|
|
|
"mime_type": "image/jpeg",
|
|
|
|
"url": "https://upload.wikimedia.org/wikipedia/commons/b/b4/JPEG_example_JPG_RIP_100.jpg",
|
|
|
|
"hashes": {
|
|
|
|
"MD5": "a"
|
|
|
|
}
|
|
|
|
}""",
|
2018-07-13 17:10:05 +02:00
|
|
|
],
|
|
|
|
)
|
2017-05-03 23:35:33 +02:00
|
|
|
def test_parse_artifact_invalid(data):
|
2017-08-29 21:15:32 +02:00
|
|
|
odata_str = OBJECTS_REGEX.sub('"objects": { %s }' % data, EXPECTED)
|
Improved the exception class hierarchy:
- Removed all plain python base classes (e.g. ValueError, TypeError)
- Renamed InvalidPropertyConfigurationError -> PropertyPresenceError,
since incorrect values could be considered a property config error, and
I really just wanted this class to apply to presence (co-)constraint
violations.
- Added ObjectConfigurationError as a superclass of InvalidValueError,
PropertyPresenceError, and any other exception that could be raised
during _STIXBase object init, which is when the spec compliance
checks happen. This class is intended to represent general spec
violations.
- Did some class reordering in exceptions.py, so all the
ObjectConfigurationError subclasses were together.
Changed how property "cleaning" errors were handled:
- Previous docs said they should all be ValueErrors, but that would require
extra exception check-and-replace complexity in the property
implementations, so that requirement is removed. Doc is changed to just
say that cleaning problems should cause exceptions to be raised.
_STIXBase._check_property() now handles most exception types, not just
ValueError.
- Decided to try chaining the original clean error to the InvalidValueError,
in case the extra diagnostics would be helpful in the future. This is
done via 'six' adapter function and only works on python3.
- A small amount of testing was removed, since it was looking at custom
exception properties which became unavailable once the exception was
replaced with InvalidValueError.
Did another pass through unit tests to fix breakage caused by the changed
exception class hierarchy.
Removed unnecessary observable extension handling code from
parse_observable(), since it was all duplicated in ExtensionsProperty.
The redundant code in parse_observable() had different exception behavior
than ExtensionsProperty, which makes the API inconsistent and unit tests
more complicated. (Problems in ExtensionsProperty get replaced with
InvalidValueError, but extensions problems handled directly in
parse_observable() don't get the same replacement, and so the exception
type is different.)
Redid the workbench monkeypatching. The old way was impossible to make
work, and had caused ugly ripple effect hackage in other parts of the
codebase. Now, it replaces the global object maps with factory functions
which behave the same way when called, as real classes. Had to fix up a
few unit tests to get them all passing with this monkeypatching in place.
Also remove all the xfail markings in the workbench test suite, since all
tests now pass.
Since workbench monkeypatching isn't currently affecting any unit tests,
tox.ini was simplified to remove the special-casing for running the
workbench tests.
Removed the v20 workbench test suite, since the workbench currently only
works with the latest stix object version.
2019-07-19 20:50:11 +02:00
|
|
|
with pytest.raises(InvalidValueError):
|
2018-07-05 21:23:25 +02:00
|
|
|
stix2.parse(odata_str, version="2.0")
|
2017-04-19 15:22:08 +02:00
|
|
|
|
2017-05-04 00:19:30 +02:00
|
|
|
|
2017-06-07 17:06:20 +02:00
|
|
|
def test_artifact_example_dependency_error():
|
|
|
|
with pytest.raises(stix2.exceptions.DependentPropertiesError) as excinfo:
|
2018-07-05 21:23:25 +02:00
|
|
|
stix2.v20.Artifact(url="http://example.com/sirvizio.exe")
|
2017-06-07 17:06:20 +02:00
|
|
|
|
|
|
|
assert excinfo.value.dependencies == [("hashes", "url")]
|
2017-08-29 21:15:32 +02:00
|
|
|
assert str(excinfo.value) == "The property dependencies for Artifact: (hashes, url) are not met."
|
2017-06-07 17:06:20 +02:00
|
|
|
|
|
|
|
|
2018-07-13 17:10:05 +02:00
|
|
|
@pytest.mark.parametrize(
|
|
|
|
"data", [
|
|
|
|
""""0": {
|
2017-05-04 00:19:30 +02:00
|
|
|
"type": "autonomous-system",
|
|
|
|
"number": 15139,
|
|
|
|
"name": "Slime Industries",
|
|
|
|
"rir": "ARIN"
|
|
|
|
}""",
|
2018-07-13 17:10:05 +02:00
|
|
|
],
|
|
|
|
)
|
2017-05-04 00:19:30 +02:00
|
|
|
def test_parse_autonomous_system_valid(data):
|
2017-08-29 21:15:32 +02:00
|
|
|
odata_str = OBJECTS_REGEX.sub('"objects": { %s }' % data, EXPECTED)
|
2018-07-05 21:23:25 +02:00
|
|
|
odata = stix2.parse(odata_str, version="2.0")
|
2017-05-04 00:19:30 +02:00
|
|
|
assert odata.objects["0"].type == "autonomous-system"
|
|
|
|
assert odata.objects["0"].number == 15139
|
|
|
|
assert odata.objects["0"].name == "Slime Industries"
|
|
|
|
assert odata.objects["0"].rir == "ARIN"
|
|
|
|
|
|
|
|
|
2018-07-13 17:10:05 +02:00
|
|
|
@pytest.mark.parametrize(
|
|
|
|
"data", [
|
|
|
|
"""{
|
2017-07-12 23:02:51 +02:00
|
|
|
"type": "email-addr",
|
2017-05-05 18:32:02 +02:00
|
|
|
"value": "john@example.com",
|
|
|
|
"display_name": "John Doe",
|
|
|
|
"belongs_to_ref": "0"
|
|
|
|
}""",
|
2018-07-13 17:10:05 +02:00
|
|
|
],
|
|
|
|
)
|
2017-05-05 18:32:02 +02:00
|
|
|
def test_parse_email_address(data):
|
2018-07-05 21:23:25 +02:00
|
|
|
odata = stix2.parse_observable(data, {"0": "user-account"}, version='2.0')
|
2017-07-12 23:02:51 +02:00
|
|
|
assert odata.type == "email-addr"
|
2017-05-05 18:32:02 +02:00
|
|
|
|
2017-05-17 21:21:02 +02:00
|
|
|
odata_str = re.compile('"belongs_to_ref": "0"', re.DOTALL).sub('"belongs_to_ref": "3"', data)
|
|
|
|
with pytest.raises(stix2.exceptions.InvalidObjRefError):
|
2018-07-05 21:23:25 +02:00
|
|
|
stix2.parse_observable(odata_str, {"0": "user-account"}, version='2.0')
|
2017-05-05 18:32:02 +02:00
|
|
|
|
|
|
|
|
2018-07-13 17:10:05 +02:00
|
|
|
@pytest.mark.parametrize(
|
|
|
|
"data", [
|
|
|
|
"""
|
2017-05-09 17:03:19 +02:00
|
|
|
{
|
|
|
|
"type": "email-message",
|
|
|
|
"is_multipart": true,
|
|
|
|
"content_type": "multipart/mixed",
|
|
|
|
"date": "2016-06-19T14:20:40.000Z",
|
|
|
|
"from_ref": "1",
|
|
|
|
"to_refs": [
|
|
|
|
"2"
|
|
|
|
],
|
|
|
|
"cc_refs": [
|
|
|
|
"3"
|
|
|
|
],
|
|
|
|
"subject": "Check out this picture of a cat!",
|
|
|
|
"additional_header_fields": {
|
|
|
|
"Content-Disposition": "inline",
|
|
|
|
"X-Mailer": "Mutt/1.5.23",
|
|
|
|
"X-Originating-IP": "198.51.100.3"
|
|
|
|
},
|
|
|
|
"body_multipart": [
|
|
|
|
{
|
|
|
|
"content_type": "text/plain; charset=utf-8",
|
|
|
|
"content_disposition": "inline",
|
|
|
|
"body": "Cats are funny!"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"content_type": "image/png",
|
|
|
|
"content_disposition": "attachment; filename=\\"tabby.png\\"",
|
|
|
|
"body_raw_ref": "4"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"content_type": "application/zip",
|
|
|
|
"content_disposition": "attachment; filename=\\"tabby_pics.zip\\"",
|
|
|
|
"body_raw_ref": "5"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
2018-07-13 17:10:05 +02:00
|
|
|
""",
|
|
|
|
],
|
|
|
|
)
|
2017-05-09 17:03:19 +02:00
|
|
|
def test_parse_email_message(data):
|
2017-05-17 21:21:02 +02:00
|
|
|
valid_refs = {
|
|
|
|
"0": "email-message",
|
|
|
|
"1": "email-addr",
|
|
|
|
"2": "email-addr",
|
|
|
|
"3": "email-addr",
|
|
|
|
"4": "artifact",
|
|
|
|
"5": "file",
|
|
|
|
}
|
2018-07-05 21:23:25 +02:00
|
|
|
odata = stix2.parse_observable(data, valid_refs, version='2.0')
|
2017-05-09 17:03:19 +02:00
|
|
|
assert odata.type == "email-message"
|
|
|
|
assert odata.body_multipart[0].content_disposition == "inline"
|
|
|
|
|
|
|
|
|
2018-07-13 17:10:05 +02:00
|
|
|
@pytest.mark.parametrize(
|
|
|
|
"data", [
|
|
|
|
"""
|
2017-06-08 16:09:18 +02:00
|
|
|
{
|
|
|
|
"type": "email-message",
|
|
|
|
"from_ref": "0",
|
|
|
|
"to_refs": ["1"],
|
|
|
|
"is_multipart": true,
|
|
|
|
"date": "1997-11-21T15:55:06.000Z",
|
|
|
|
"subject": "Saying Hello",
|
|
|
|
"body": "Cats are funny!"
|
|
|
|
}
|
2018-07-13 17:10:05 +02:00
|
|
|
""",
|
|
|
|
],
|
|
|
|
)
|
2017-06-08 16:09:18 +02:00
|
|
|
def test_parse_email_message_not_multipart(data):
|
|
|
|
valid_refs = {
|
|
|
|
"0": "email-addr",
|
|
|
|
"1": "email-addr",
|
|
|
|
}
|
|
|
|
with pytest.raises(stix2.exceptions.DependentPropertiesError) as excinfo:
|
2018-07-05 21:23:25 +02:00
|
|
|
stix2.parse_observable(data, valid_refs, version='2.0')
|
2017-06-08 16:09:18 +02:00
|
|
|
|
2018-07-05 21:23:25 +02:00
|
|
|
assert excinfo.value.cls == stix2.v20.EmailMessage
|
2017-06-08 16:09:18 +02:00
|
|
|
assert excinfo.value.dependencies == [("is_multipart", "body")]
|
|
|
|
|
|
|
|
|
2018-07-13 17:10:05 +02:00
|
|
|
@pytest.mark.parametrize(
|
|
|
|
"data", [
|
|
|
|
""""0": {
|
2017-05-12 17:22:23 +02:00
|
|
|
"type": "file",
|
|
|
|
"hashes": {
|
|
|
|
"SHA-256": "ceafbfd424be2ca4a5f0402cae090dda2fb0526cf521b60b60077c0f622b285a"
|
|
|
|
}
|
|
|
|
},
|
|
|
|
"1": {
|
|
|
|
"type": "file",
|
|
|
|
"hashes": {
|
|
|
|
"SHA-256": "19c549ec2628b989382f6b280cbd7bb836a0b461332c0fe53511ce7d584b89d3"
|
|
|
|
}
|
|
|
|
},
|
|
|
|
"2": {
|
|
|
|
"type": "file",
|
|
|
|
"hashes": {
|
|
|
|
"SHA-256": "0969de02ecf8a5f003e3f6d063d848c8a193aada092623f8ce408c15bcb5f038"
|
|
|
|
}
|
|
|
|
},
|
|
|
|
"3": {
|
|
|
|
"type": "file",
|
|
|
|
"name": "foo.zip",
|
|
|
|
"hashes": {
|
|
|
|
"SHA-256": "35a01331e9ad96f751278b891b6ea09699806faedfa237d40513d92ad1b7100f"
|
|
|
|
},
|
|
|
|
"mime_type": "application/zip",
|
|
|
|
"extensions": {
|
|
|
|
"archive-ext": {
|
|
|
|
"contains_refs": [
|
|
|
|
"0",
|
|
|
|
"1",
|
|
|
|
"2"
|
|
|
|
],
|
|
|
|
"version": "5.0"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}""",
|
2018-07-13 17:10:05 +02:00
|
|
|
],
|
|
|
|
)
|
2017-05-12 18:19:54 +02:00
|
|
|
def test_parse_file_archive(data):
|
2017-08-29 21:15:32 +02:00
|
|
|
odata_str = OBJECTS_REGEX.sub('"objects": { %s }' % data, EXPECTED)
|
2018-07-05 21:23:25 +02:00
|
|
|
odata = stix2.parse(odata_str, version="2.0")
|
2017-05-12 17:22:23 +02:00
|
|
|
assert odata.objects["3"].extensions['archive-ext'].version == "5.0"
|
|
|
|
|
|
|
|
|
2018-07-13 17:10:05 +02:00
|
|
|
@pytest.mark.parametrize(
|
|
|
|
"data", [
|
|
|
|
"""
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
{
|
|
|
|
"type": "email-message",
|
|
|
|
"is_multipart": true,
|
|
|
|
"content_type": "multipart/mixed",
|
|
|
|
"date": "2016-06-19T14:20:40.000Z",
|
|
|
|
"from_ref": "1",
|
|
|
|
"to_refs": [
|
|
|
|
"2"
|
|
|
|
],
|
|
|
|
"cc_refs": [
|
|
|
|
"3"
|
|
|
|
],
|
|
|
|
"subject": "Check out this picture of a cat!",
|
|
|
|
"additional_header_fields": {
|
|
|
|
"Content-Disposition": "inline",
|
|
|
|
"X-Mailer": "Mutt/1.5.23",
|
|
|
|
"X-Originating-IP": "198.51.100.3"
|
|
|
|
},
|
|
|
|
"body_multipart": [
|
|
|
|
{
|
|
|
|
"content_type": "text/plain; charset=utf-8",
|
|
|
|
"content_disposition": "inline",
|
|
|
|
"body": "Cats are funny!"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"content_type": "image/png",
|
|
|
|
"content_disposition": "attachment; filename=\\"tabby.png\\""
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"content_type": "application/zip",
|
|
|
|
"content_disposition": "attachment; filename=\\"tabby_pics.zip\\"",
|
|
|
|
"body_raw_ref": "5"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
2018-07-13 17:10:05 +02:00
|
|
|
""",
|
|
|
|
],
|
|
|
|
)
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
def test_parse_email_message_with_at_least_one_error(data):
|
2017-05-17 21:21:02 +02:00
|
|
|
valid_refs = {
|
|
|
|
"0": "email-message",
|
|
|
|
"1": "email-addr",
|
|
|
|
"2": "email-addr",
|
|
|
|
"3": "email-addr",
|
|
|
|
"4": "artifact",
|
|
|
|
"5": "file",
|
|
|
|
}
|
Improved the exception class hierarchy:
- Removed all plain python base classes (e.g. ValueError, TypeError)
- Renamed InvalidPropertyConfigurationError -> PropertyPresenceError,
since incorrect values could be considered a property config error, and
I really just wanted this class to apply to presence (co-)constraint
violations.
- Added ObjectConfigurationError as a superclass of InvalidValueError,
PropertyPresenceError, and any other exception that could be raised
during _STIXBase object init, which is when the spec compliance
checks happen. This class is intended to represent general spec
violations.
- Did some class reordering in exceptions.py, so all the
ObjectConfigurationError subclasses were together.
Changed how property "cleaning" errors were handled:
- Previous docs said they should all be ValueErrors, but that would require
extra exception check-and-replace complexity in the property
implementations, so that requirement is removed. Doc is changed to just
say that cleaning problems should cause exceptions to be raised.
_STIXBase._check_property() now handles most exception types, not just
ValueError.
- Decided to try chaining the original clean error to the InvalidValueError,
in case the extra diagnostics would be helpful in the future. This is
done via 'six' adapter function and only works on python3.
- A small amount of testing was removed, since it was looking at custom
exception properties which became unavailable once the exception was
replaced with InvalidValueError.
Did another pass through unit tests to fix breakage caused by the changed
exception class hierarchy.
Removed unnecessary observable extension handling code from
parse_observable(), since it was all duplicated in ExtensionsProperty.
The redundant code in parse_observable() had different exception behavior
than ExtensionsProperty, which makes the API inconsistent and unit tests
more complicated. (Problems in ExtensionsProperty get replaced with
InvalidValueError, but extensions problems handled directly in
parse_observable() don't get the same replacement, and so the exception
type is different.)
Redid the workbench monkeypatching. The old way was impossible to make
work, and had caused ugly ripple effect hackage in other parts of the
codebase. Now, it replaces the global object maps with factory functions
which behave the same way when called, as real classes. Had to fix up a
few unit tests to get them all passing with this monkeypatching in place.
Also remove all the xfail markings in the workbench test suite, since all
tests now pass.
Since workbench monkeypatching isn't currently affecting any unit tests,
tox.ini was simplified to remove the special-casing for running the
workbench tests.
Removed the v20 workbench test suite, since the workbench currently only
works with the latest stix object version.
2019-07-19 20:50:11 +02:00
|
|
|
with pytest.raises(InvalidValueError) as excinfo:
|
2018-07-05 21:23:25 +02:00
|
|
|
stix2.parse_observable(data, valid_refs, version='2.0')
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
|
Improved the exception class hierarchy:
- Removed all plain python base classes (e.g. ValueError, TypeError)
- Renamed InvalidPropertyConfigurationError -> PropertyPresenceError,
since incorrect values could be considered a property config error, and
I really just wanted this class to apply to presence (co-)constraint
violations.
- Added ObjectConfigurationError as a superclass of InvalidValueError,
PropertyPresenceError, and any other exception that could be raised
during _STIXBase object init, which is when the spec compliance
checks happen. This class is intended to represent general spec
violations.
- Did some class reordering in exceptions.py, so all the
ObjectConfigurationError subclasses were together.
Changed how property "cleaning" errors were handled:
- Previous docs said they should all be ValueErrors, but that would require
extra exception check-and-replace complexity in the property
implementations, so that requirement is removed. Doc is changed to just
say that cleaning problems should cause exceptions to be raised.
_STIXBase._check_property() now handles most exception types, not just
ValueError.
- Decided to try chaining the original clean error to the InvalidValueError,
in case the extra diagnostics would be helpful in the future. This is
done via 'six' adapter function and only works on python3.
- A small amount of testing was removed, since it was looking at custom
exception properties which became unavailable once the exception was
replaced with InvalidValueError.
Did another pass through unit tests to fix breakage caused by the changed
exception class hierarchy.
Removed unnecessary observable extension handling code from
parse_observable(), since it was all duplicated in ExtensionsProperty.
The redundant code in parse_observable() had different exception behavior
than ExtensionsProperty, which makes the API inconsistent and unit tests
more complicated. (Problems in ExtensionsProperty get replaced with
InvalidValueError, but extensions problems handled directly in
parse_observable() don't get the same replacement, and so the exception
type is different.)
Redid the workbench monkeypatching. The old way was impossible to make
work, and had caused ugly ripple effect hackage in other parts of the
codebase. Now, it replaces the global object maps with factory functions
which behave the same way when called, as real classes. Had to fix up a
few unit tests to get them all passing with this monkeypatching in place.
Also remove all the xfail markings in the workbench test suite, since all
tests now pass.
Since workbench monkeypatching isn't currently affecting any unit tests,
tox.ini was simplified to remove the special-casing for running the
workbench tests.
Removed the v20 workbench test suite, since the workbench currently only
works with the latest stix object version.
2019-07-19 20:50:11 +02:00
|
|
|
assert excinfo.value.cls == stix2.v20.EmailMessage
|
2017-08-24 23:53:43 +02:00
|
|
|
assert "At least one of the" in str(excinfo.value)
|
|
|
|
assert "must be populated" in str(excinfo.value)
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
|
|
|
|
|
2018-07-13 17:10:05 +02:00
|
|
|
@pytest.mark.parametrize(
|
|
|
|
"data", [
|
|
|
|
"""
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
{
|
|
|
|
"type": "network-traffic",
|
|
|
|
"src_ref": "0",
|
|
|
|
"dst_ref": "1",
|
|
|
|
"protocols": [
|
|
|
|
"tcp"
|
|
|
|
]
|
|
|
|
}
|
2018-07-13 17:10:05 +02:00
|
|
|
""",
|
|
|
|
],
|
|
|
|
)
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
def test_parse_basic_tcp_traffic(data):
|
2018-07-13 17:10:05 +02:00
|
|
|
odata = stix2.parse_observable(
|
|
|
|
data, {"0": "ipv4-addr", "1": "ipv4-addr"},
|
|
|
|
version='2.0',
|
|
|
|
)
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
|
|
|
|
assert odata.type == "network-traffic"
|
|
|
|
assert odata.src_ref == "0"
|
|
|
|
assert odata.dst_ref == "1"
|
|
|
|
assert odata.protocols == ["tcp"]
|
|
|
|
|
|
|
|
|
2018-07-13 17:10:05 +02:00
|
|
|
@pytest.mark.parametrize(
|
|
|
|
"data", [
|
|
|
|
"""
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
{
|
|
|
|
"type": "network-traffic",
|
|
|
|
"src_port": 2487,
|
|
|
|
"dst_port": 1723,
|
|
|
|
"protocols": [
|
|
|
|
"ipv4",
|
|
|
|
"pptp"
|
|
|
|
],
|
|
|
|
"src_byte_count": 35779,
|
|
|
|
"dst_byte_count": 935750,
|
|
|
|
"encapsulates_refs": [
|
|
|
|
"4"
|
|
|
|
]
|
|
|
|
}
|
2018-07-13 17:10:05 +02:00
|
|
|
""",
|
|
|
|
],
|
|
|
|
)
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
def test_parse_basic_tcp_traffic_with_error(data):
|
|
|
|
with pytest.raises(stix2.exceptions.AtLeastOnePropertyError) as excinfo:
|
2018-07-05 21:23:25 +02:00
|
|
|
stix2.parse_observable(data, {"4": "network-traffic"}, version='2.0')
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
|
2018-07-05 21:23:25 +02:00
|
|
|
assert excinfo.value.cls == stix2.v20.NetworkTraffic
|
2017-05-16 18:27:30 +02:00
|
|
|
assert excinfo.value.properties == ["dst_ref", "src_ref"]
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
|
|
|
|
|
|
|
|
EXPECTED_PROCESS_OD = """{
|
2017-06-23 00:47:35 +02:00
|
|
|
"created": "2016-04-06T19:58:16.000Z",
|
2019-01-29 16:52:59 +01:00
|
|
|
"created_by_ref": "identity--311b2d2d-f010-4473-83ec-1edf84858f4c",
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
"first_observed": "2015-12-21T19:00:00Z",
|
|
|
|
"id": "observed-data--b67d30ff-02ac-498a-92f9-32f845f448cf",
|
|
|
|
"last_observed": "2015-12-21T19:00:00Z",
|
2017-06-23 00:47:35 +02:00
|
|
|
"modified": "2016-04-06T19:58:16.000Z",
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
"number_observed": 50,
|
|
|
|
"objects": {
|
|
|
|
"0": {
|
|
|
|
"type": "file",
|
|
|
|
"hashes": {
|
|
|
|
"SHA-256": "35a01331e9ad96f751278b891b6ea09699806faedfa237d40513d92ad1b7100fSHA"
|
|
|
|
},
|
|
|
|
},
|
|
|
|
"1": {
|
|
|
|
"type": "process",
|
|
|
|
"pid": 1221,
|
|
|
|
"name": "gedit-bin",
|
|
|
|
"created": "2016-01-20T14:11:25.55Z",
|
|
|
|
"arguments" :[
|
|
|
|
"--new-window"
|
|
|
|
],
|
|
|
|
"binary_ref": "0"
|
|
|
|
}
|
|
|
|
},
|
|
|
|
"type": "observed-data"
|
|
|
|
}"""
|
|
|
|
|
|
|
|
|
|
|
|
def test_observed_data_with_process_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
observed_data = stix2.v20.ObservedData(
|
2019-01-23 05:07:20 +01:00
|
|
|
id=OBSERVED_DATA_ID,
|
2019-01-29 16:52:59 +01:00
|
|
|
created_by_ref=IDENTITY_ID,
|
2017-06-23 00:47:35 +02:00
|
|
|
created="2016-04-06T19:58:16.000Z",
|
|
|
|
modified="2016-04-06T19:58:16.000Z",
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
first_observed="2015-12-21T19:00:00Z",
|
|
|
|
last_observed="2015-12-21T19:00:00Z",
|
|
|
|
number_observed=50,
|
|
|
|
objects={
|
|
|
|
"0": {
|
|
|
|
"type": "file",
|
|
|
|
"hashes": {
|
2018-07-13 17:10:05 +02:00
|
|
|
"SHA-256": "35a01331e9ad96f751278b891b6ea09699806faedfa237d40513d92ad1b7100f",
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
},
|
|
|
|
},
|
|
|
|
"1": {
|
|
|
|
"type": "process",
|
|
|
|
"pid": 1221,
|
|
|
|
"name": "gedit-bin",
|
|
|
|
"created": "2016-01-20T14:11:25.55Z",
|
|
|
|
"arguments": [
|
2018-07-13 17:10:05 +02:00
|
|
|
"--new-window",
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
],
|
2018-07-13 17:10:05 +02:00
|
|
|
"binary_ref": "0",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
)
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
|
|
|
|
assert observed_data.objects["0"].type == "file"
|
|
|
|
assert observed_data.objects["0"].hashes["SHA-256"] == "35a01331e9ad96f751278b891b6ea09699806faedfa237d40513d92ad1b7100f"
|
|
|
|
assert observed_data.objects["1"].type == "process"
|
|
|
|
assert observed_data.objects["1"].pid == 1221
|
|
|
|
assert observed_data.objects["1"].name == "gedit-bin"
|
|
|
|
assert observed_data.objects["1"].arguments[0] == "--new-window"
|
|
|
|
|
|
|
|
|
2017-05-09 03:03:15 +02:00
|
|
|
# creating cyber observables directly
|
|
|
|
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
def test_artifact_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
art = stix2.v20.Artifact(
|
|
|
|
mime_type="image/jpeg",
|
|
|
|
url="https://upload.wikimedia.org/wikipedia/commons/b/b4/JPEG_example_JPG_RIP_100.jpg",
|
|
|
|
hashes={
|
2018-07-13 17:10:05 +02:00
|
|
|
"MD5": "6826f9a05da08134006557758bb3afbb",
|
|
|
|
},
|
|
|
|
)
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
assert art.mime_type == "image/jpeg"
|
|
|
|
assert art.url == "https://upload.wikimedia.org/wikipedia/commons/b/b4/JPEG_example_JPG_RIP_100.jpg"
|
|
|
|
assert art.hashes["MD5"] == "6826f9a05da08134006557758bb3afbb"
|
|
|
|
|
|
|
|
|
|
|
|
def test_artifact_mutual_exclusion_error():
|
|
|
|
with pytest.raises(stix2.exceptions.MutuallyExclusivePropertiesError) as excinfo:
|
2018-07-05 21:23:25 +02:00
|
|
|
stix2.v20.Artifact(
|
|
|
|
mime_type="image/jpeg",
|
|
|
|
url="https://upload.wikimedia.org/wikipedia/commons/b/b4/JPEG_example_JPG_RIP_100.jpg",
|
|
|
|
hashes={
|
2018-07-13 17:10:05 +02:00
|
|
|
"MD5": "6826f9a05da08134006557758bb3afbb",
|
2018-07-05 21:23:25 +02:00
|
|
|
},
|
2018-07-13 17:10:05 +02:00
|
|
|
payload_bin="VBORw0KGgoAAAANSUhEUgAAADI==",
|
|
|
|
)
|
2018-07-05 21:23:25 +02:00
|
|
|
|
|
|
|
assert excinfo.value.cls == stix2.v20.Artifact
|
2017-05-16 18:27:30 +02:00
|
|
|
assert excinfo.value.properties == ["payload_bin", "url"]
|
2017-08-24 23:53:43 +02:00
|
|
|
assert 'are mutually exclusive' in str(excinfo.value)
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
|
|
|
|
|
2017-05-09 03:03:15 +02:00
|
|
|
def test_directory_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
dir = stix2.v20.Directory(
|
|
|
|
_valid_refs={"1": "file"},
|
|
|
|
path='/usr/lib',
|
|
|
|
created="2015-12-21T19:00:00Z",
|
|
|
|
modified="2015-12-24T19:00:00Z",
|
|
|
|
accessed="2015-12-21T20:00:00Z",
|
2018-07-13 17:10:05 +02:00
|
|
|
contains_refs=["1"],
|
|
|
|
)
|
2017-05-09 03:03:15 +02:00
|
|
|
|
|
|
|
assert dir.path == '/usr/lib'
|
|
|
|
assert dir.created == dt.datetime(2015, 12, 21, 19, 0, 0, tzinfo=pytz.utc)
|
|
|
|
assert dir.modified == dt.datetime(2015, 12, 24, 19, 0, 0, tzinfo=pytz.utc)
|
|
|
|
assert dir.accessed == dt.datetime(2015, 12, 21, 20, 0, 0, tzinfo=pytz.utc)
|
|
|
|
assert dir.contains_refs == ["1"]
|
|
|
|
|
|
|
|
|
|
|
|
def test_directory_example_ref_error():
|
|
|
|
with pytest.raises(stix2.exceptions.InvalidObjRefError) as excinfo:
|
2018-07-05 21:23:25 +02:00
|
|
|
stix2.v20.Directory(
|
|
|
|
_valid_refs=[],
|
|
|
|
path='/usr/lib',
|
|
|
|
created="2015-12-21T19:00:00Z",
|
|
|
|
modified="2015-12-24T19:00:00Z",
|
|
|
|
accessed="2015-12-21T20:00:00Z",
|
2018-07-13 17:10:05 +02:00
|
|
|
contains_refs=["1"],
|
|
|
|
)
|
2018-07-05 21:23:25 +02:00
|
|
|
|
|
|
|
assert excinfo.value.cls == stix2.v20.Directory
|
2017-05-09 03:03:15 +02:00
|
|
|
assert excinfo.value.prop_name == "contains_refs"
|
|
|
|
|
|
|
|
|
|
|
|
def test_domain_name_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
dn = stix2.v20.DomainName(
|
|
|
|
_valid_refs={"1": 'domain-name'},
|
|
|
|
value="example.com",
|
2018-07-13 17:10:05 +02:00
|
|
|
resolves_to_refs=["1"],
|
|
|
|
)
|
2017-05-09 03:03:15 +02:00
|
|
|
|
|
|
|
assert dn.value == "example.com"
|
|
|
|
assert dn.resolves_to_refs == ["1"]
|
|
|
|
|
|
|
|
|
2017-05-17 21:21:02 +02:00
|
|
|
def test_domain_name_example_invalid_ref_type():
|
|
|
|
with pytest.raises(stix2.exceptions.InvalidObjRefError) as excinfo:
|
2018-07-05 21:23:25 +02:00
|
|
|
stix2.v20.DomainName(
|
|
|
|
_valid_refs={"1": "file"},
|
|
|
|
value="example.com",
|
2018-07-13 17:10:05 +02:00
|
|
|
resolves_to_refs=["1"],
|
|
|
|
)
|
2017-05-17 21:21:02 +02:00
|
|
|
|
2018-07-05 21:23:25 +02:00
|
|
|
assert excinfo.value.cls == stix2.v20.DomainName
|
2017-05-17 21:21:02 +02:00
|
|
|
assert excinfo.value.prop_name == "resolves_to_refs"
|
|
|
|
|
|
|
|
|
2017-05-09 03:03:15 +02:00
|
|
|
def test_file_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
f = stix2.v20.File(
|
|
|
|
name="qwerty.dll",
|
|
|
|
hashes={
|
2018-07-13 17:10:05 +02:00
|
|
|
"SHA-256": "ceafbfd424be2ca4a5f0402cae090dda2fb0526cf521b60b60077c0f622b285a",
|
2018-07-10 20:46:46 +02:00
|
|
|
},
|
2018-07-05 21:23:25 +02:00
|
|
|
size=100,
|
|
|
|
magic_number_hex="1C",
|
|
|
|
mime_type="application/msword",
|
|
|
|
created="2016-12-21T19:00:00Z",
|
|
|
|
modified="2016-12-24T19:00:00Z",
|
|
|
|
accessed="2016-12-21T20:00:00Z",
|
|
|
|
is_encrypted=True,
|
|
|
|
encryption_algorithm="AES128-CBC",
|
2018-07-13 17:10:05 +02:00
|
|
|
decryption_key="fred",
|
|
|
|
)
|
2017-05-09 03:03:15 +02:00
|
|
|
|
|
|
|
assert f.name == "qwerty.dll"
|
|
|
|
assert f.size == 100
|
|
|
|
assert f.magic_number_hex == "1C"
|
|
|
|
assert f.hashes["SHA-256"] == "ceafbfd424be2ca4a5f0402cae090dda2fb0526cf521b60b60077c0f622b285a"
|
|
|
|
assert f.mime_type == "application/msword"
|
|
|
|
assert f.created == dt.datetime(2016, 12, 21, 19, 0, 0, tzinfo=pytz.utc)
|
|
|
|
assert f.modified == dt.datetime(2016, 12, 24, 19, 0, 0, tzinfo=pytz.utc)
|
|
|
|
assert f.accessed == dt.datetime(2016, 12, 21, 20, 0, 0, tzinfo=pytz.utc)
|
|
|
|
assert f.is_encrypted
|
2017-05-09 21:28:32 +02:00
|
|
|
assert f.encryption_algorithm == "AES128-CBC"
|
2017-05-09 03:03:15 +02:00
|
|
|
assert f.decryption_key == "fred" # does the key have a format we can test for?
|
|
|
|
|
|
|
|
|
2017-05-17 21:33:28 +02:00
|
|
|
def test_file_example_with_NTFSExt():
|
2018-07-05 21:23:25 +02:00
|
|
|
f = stix2.v20.File(
|
|
|
|
name="abc.txt",
|
|
|
|
extensions={
|
|
|
|
"ntfs-ext": {
|
|
|
|
"alternate_data_streams": [
|
|
|
|
{
|
|
|
|
"name": "second.stream",
|
2018-07-13 17:10:05 +02:00
|
|
|
"size": 25536,
|
|
|
|
},
|
|
|
|
],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
)
|
2017-05-17 21:33:28 +02:00
|
|
|
|
|
|
|
assert f.name == "abc.txt"
|
|
|
|
assert f.extensions["ntfs-ext"].alternate_data_streams[0].size == 25536
|
|
|
|
|
|
|
|
|
|
|
|
def test_file_example_with_empty_NTFSExt():
|
Improved the exception class hierarchy:
- Removed all plain python base classes (e.g. ValueError, TypeError)
- Renamed InvalidPropertyConfigurationError -> PropertyPresenceError,
since incorrect values could be considered a property config error, and
I really just wanted this class to apply to presence (co-)constraint
violations.
- Added ObjectConfigurationError as a superclass of InvalidValueError,
PropertyPresenceError, and any other exception that could be raised
during _STIXBase object init, which is when the spec compliance
checks happen. This class is intended to represent general spec
violations.
- Did some class reordering in exceptions.py, so all the
ObjectConfigurationError subclasses were together.
Changed how property "cleaning" errors were handled:
- Previous docs said they should all be ValueErrors, but that would require
extra exception check-and-replace complexity in the property
implementations, so that requirement is removed. Doc is changed to just
say that cleaning problems should cause exceptions to be raised.
_STIXBase._check_property() now handles most exception types, not just
ValueError.
- Decided to try chaining the original clean error to the InvalidValueError,
in case the extra diagnostics would be helpful in the future. This is
done via 'six' adapter function and only works on python3.
- A small amount of testing was removed, since it was looking at custom
exception properties which became unavailable once the exception was
replaced with InvalidValueError.
Did another pass through unit tests to fix breakage caused by the changed
exception class hierarchy.
Removed unnecessary observable extension handling code from
parse_observable(), since it was all duplicated in ExtensionsProperty.
The redundant code in parse_observable() had different exception behavior
than ExtensionsProperty, which makes the API inconsistent and unit tests
more complicated. (Problems in ExtensionsProperty get replaced with
InvalidValueError, but extensions problems handled directly in
parse_observable() don't get the same replacement, and so the exception
type is different.)
Redid the workbench monkeypatching. The old way was impossible to make
work, and had caused ugly ripple effect hackage in other parts of the
codebase. Now, it replaces the global object maps with factory functions
which behave the same way when called, as real classes. Had to fix up a
few unit tests to get them all passing with this monkeypatching in place.
Also remove all the xfail markings in the workbench test suite, since all
tests now pass.
Since workbench monkeypatching isn't currently affecting any unit tests,
tox.ini was simplified to remove the special-casing for running the
workbench tests.
Removed the v20 workbench test suite, since the workbench currently only
works with the latest stix object version.
2019-07-19 20:50:11 +02:00
|
|
|
with pytest.raises(InvalidValueError) as excinfo:
|
2018-07-05 21:23:25 +02:00
|
|
|
stix2.v20.File(
|
|
|
|
name="abc.txt",
|
|
|
|
extensions={
|
2018-07-13 17:10:05 +02:00
|
|
|
"ntfs-ext": {},
|
|
|
|
},
|
|
|
|
)
|
2017-05-17 21:33:28 +02:00
|
|
|
|
Improved the exception class hierarchy:
- Removed all plain python base classes (e.g. ValueError, TypeError)
- Renamed InvalidPropertyConfigurationError -> PropertyPresenceError,
since incorrect values could be considered a property config error, and
I really just wanted this class to apply to presence (co-)constraint
violations.
- Added ObjectConfigurationError as a superclass of InvalidValueError,
PropertyPresenceError, and any other exception that could be raised
during _STIXBase object init, which is when the spec compliance
checks happen. This class is intended to represent general spec
violations.
- Did some class reordering in exceptions.py, so all the
ObjectConfigurationError subclasses were together.
Changed how property "cleaning" errors were handled:
- Previous docs said they should all be ValueErrors, but that would require
extra exception check-and-replace complexity in the property
implementations, so that requirement is removed. Doc is changed to just
say that cleaning problems should cause exceptions to be raised.
_STIXBase._check_property() now handles most exception types, not just
ValueError.
- Decided to try chaining the original clean error to the InvalidValueError,
in case the extra diagnostics would be helpful in the future. This is
done via 'six' adapter function and only works on python3.
- A small amount of testing was removed, since it was looking at custom
exception properties which became unavailable once the exception was
replaced with InvalidValueError.
Did another pass through unit tests to fix breakage caused by the changed
exception class hierarchy.
Removed unnecessary observable extension handling code from
parse_observable(), since it was all duplicated in ExtensionsProperty.
The redundant code in parse_observable() had different exception behavior
than ExtensionsProperty, which makes the API inconsistent and unit tests
more complicated. (Problems in ExtensionsProperty get replaced with
InvalidValueError, but extensions problems handled directly in
parse_observable() don't get the same replacement, and so the exception
type is different.)
Redid the workbench monkeypatching. The old way was impossible to make
work, and had caused ugly ripple effect hackage in other parts of the
codebase. Now, it replaces the global object maps with factory functions
which behave the same way when called, as real classes. Had to fix up a
few unit tests to get them all passing with this monkeypatching in place.
Also remove all the xfail markings in the workbench test suite, since all
tests now pass.
Since workbench monkeypatching isn't currently affecting any unit tests,
tox.ini was simplified to remove the special-casing for running the
workbench tests.
Removed the v20 workbench test suite, since the workbench currently only
works with the latest stix object version.
2019-07-19 20:50:11 +02:00
|
|
|
assert excinfo.value.cls == stix2.v20.File
|
2017-05-17 21:33:28 +02:00
|
|
|
|
|
|
|
|
2017-05-15 19:48:41 +02:00
|
|
|
def test_file_example_with_PDFExt():
|
2018-07-05 21:23:25 +02:00
|
|
|
f = stix2.v20.File(
|
|
|
|
name="qwerty.dll",
|
|
|
|
extensions={
|
|
|
|
"pdf-ext": {
|
|
|
|
"version": "1.7",
|
|
|
|
"document_info_dict": {
|
|
|
|
"Title": "Sample document",
|
|
|
|
"Author": "Adobe Systems Incorporated",
|
|
|
|
"Creator": "Adobe FrameMaker 5.5.3 for Power Macintosh",
|
|
|
|
"Producer": "Acrobat Distiller 3.01 for Power Macintosh",
|
2018-07-13 17:10:05 +02:00
|
|
|
"CreationDate": "20070412090123-02",
|
2018-07-05 21:23:25 +02:00
|
|
|
},
|
|
|
|
"pdfid0": "DFCE52BD827ECF765649852119D",
|
2018-07-13 17:10:05 +02:00
|
|
|
"pdfid1": "57A1E0F9ED2AE523E313C",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
)
|
2017-05-15 19:48:41 +02:00
|
|
|
|
|
|
|
assert f.name == "qwerty.dll"
|
|
|
|
assert f.extensions["pdf-ext"].version == "1.7"
|
|
|
|
assert f.extensions["pdf-ext"].document_info_dict["Title"] == "Sample document"
|
|
|
|
|
|
|
|
|
2017-05-16 18:39:04 +02:00
|
|
|
def test_file_example_with_PDFExt_Object():
|
2018-07-05 21:23:25 +02:00
|
|
|
f = stix2.v20.File(
|
|
|
|
name="qwerty.dll",
|
|
|
|
extensions={
|
|
|
|
"pdf-ext": stix2.v20.PDFExt(
|
|
|
|
version="1.7",
|
|
|
|
document_info_dict={
|
|
|
|
"Title": "Sample document",
|
|
|
|
"Author": "Adobe Systems Incorporated",
|
|
|
|
"Creator": "Adobe FrameMaker 5.5.3 for Power Macintosh",
|
|
|
|
"Producer": "Acrobat Distiller 3.01 for Power Macintosh",
|
2018-07-13 17:10:05 +02:00
|
|
|
"CreationDate": "20070412090123-02",
|
2018-07-05 21:23:25 +02:00
|
|
|
},
|
|
|
|
pdfid0="DFCE52BD827ECF765649852119D",
|
2018-07-13 17:10:05 +02:00
|
|
|
pdfid1="57A1E0F9ED2AE523E313C",
|
|
|
|
),
|
|
|
|
},
|
|
|
|
)
|
2017-05-16 18:39:04 +02:00
|
|
|
|
|
|
|
assert f.name == "qwerty.dll"
|
|
|
|
assert f.extensions["pdf-ext"].version == "1.7"
|
|
|
|
assert f.extensions["pdf-ext"].document_info_dict["Title"] == "Sample document"
|
|
|
|
|
|
|
|
|
|
|
|
def test_file_example_with_RasterImageExt_Object():
|
2018-07-05 21:23:25 +02:00
|
|
|
f = stix2.v20.File(
|
|
|
|
name="qwerty.jpeg",
|
|
|
|
extensions={
|
|
|
|
"raster-image-ext": {
|
|
|
|
"bits_per_pixel": 123,
|
|
|
|
"exif_tags": {
|
|
|
|
"Make": "Nikon",
|
|
|
|
"Model": "D7000",
|
|
|
|
"XResolution": 4928,
|
2018-07-13 17:10:05 +02:00
|
|
|
"YResolution": 3264,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
)
|
2017-05-16 18:39:04 +02:00
|
|
|
assert f.name == "qwerty.jpeg"
|
|
|
|
assert f.extensions["raster-image-ext"].bits_per_pixel == 123
|
|
|
|
assert f.extensions["raster-image-ext"].exif_tags["XResolution"] == 4928
|
|
|
|
|
|
|
|
|
2018-06-20 22:24:27 +02:00
|
|
|
RASTER_IMAGE_EXT = """{
|
|
|
|
"type": "observed-data",
|
|
|
|
"id": "observed-data--b67d30ff-02ac-498a-92f9-32f845f448cf",
|
|
|
|
"created": "2016-04-06T19:58:16.000Z",
|
|
|
|
"modified": "2016-04-06T19:58:16.000Z",
|
|
|
|
"first_observed": "2015-12-21T19:00:00Z",
|
|
|
|
"last_observed": "2015-12-21T19:00:00Z",
|
|
|
|
"number_observed": 1,
|
|
|
|
"objects": {
|
|
|
|
"0": {
|
|
|
|
"type": "file",
|
|
|
|
"name": "picture.jpg",
|
|
|
|
"hashes": {
|
|
|
|
"SHA-256": "35a01331e9ad96f751278b891b6ea09699806faedfa237d40513d92ad1b7100f"
|
|
|
|
},
|
|
|
|
"extensions": {
|
|
|
|
"raster-image-ext": {
|
|
|
|
"image_height": 768,
|
|
|
|
"image_width": 1024,
|
|
|
|
"bits_per_pixel": 72,
|
|
|
|
"image_compression_algorithm": "JPEG",
|
|
|
|
"exif_tags": {
|
|
|
|
"Make": "Nikon",
|
|
|
|
"Model": "D7000",
|
|
|
|
"XResolution": 4928,
|
|
|
|
"YResolution": 3264
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
|
|
def test_raster_image_ext_parse():
|
2018-07-05 21:23:25 +02:00
|
|
|
obj = stix2.parse(RASTER_IMAGE_EXT, version="2.0")
|
2018-06-20 22:24:27 +02:00
|
|
|
assert obj.objects["0"].extensions['raster-image-ext'].image_width == 1024
|
|
|
|
|
|
|
|
|
|
|
|
def test_raster_images_ext_create():
|
2018-07-05 21:23:25 +02:00
|
|
|
ext = stix2.v20.RasterImageExt(image_width=1024)
|
2018-06-20 22:24:27 +02:00
|
|
|
assert "image_width" in str(ext)
|
|
|
|
|
|
|
|
|
2017-05-16 18:39:04 +02:00
|
|
|
def test_file_example_with_WindowsPEBinaryExt():
|
2018-07-05 21:23:25 +02:00
|
|
|
f = stix2.v20.File(
|
|
|
|
name="qwerty.dll",
|
|
|
|
extensions={
|
|
|
|
"windows-pebinary-ext": {
|
|
|
|
"pe_type": "exe",
|
|
|
|
"machine_hex": "014c",
|
|
|
|
"number_of_sections": 4,
|
|
|
|
"time_date_stamp": "2016-01-22T12:31:12Z",
|
|
|
|
"pointer_to_symbol_table_hex": "74726144",
|
|
|
|
"number_of_symbols": 4542568,
|
|
|
|
"size_of_optional_header": 224,
|
|
|
|
"characteristics_hex": "818f",
|
|
|
|
"optional_header": {
|
|
|
|
"magic_hex": "010b",
|
|
|
|
"major_linker_version": 2,
|
|
|
|
"minor_linker_version": 25,
|
|
|
|
"size_of_code": 512,
|
|
|
|
"size_of_initialized_data": 283648,
|
|
|
|
"size_of_uninitialized_data": 0,
|
|
|
|
"address_of_entry_point": 4096,
|
|
|
|
"base_of_code": 4096,
|
|
|
|
"base_of_data": 8192,
|
|
|
|
"image_base": 14548992,
|
|
|
|
"section_alignment": 4096,
|
|
|
|
"file_alignment": 4096,
|
|
|
|
"major_os_version": 1,
|
|
|
|
"minor_os_version": 0,
|
|
|
|
"major_image_version": 0,
|
|
|
|
"minor_image_version": 0,
|
|
|
|
"major_subsystem_version": 4,
|
|
|
|
"minor_subsystem_version": 0,
|
|
|
|
"win32_version_value_hex": "00",
|
|
|
|
"size_of_image": 299008,
|
|
|
|
"size_of_headers": 4096,
|
|
|
|
"checksum_hex": "00",
|
|
|
|
"subsystem_hex": "03",
|
|
|
|
"dll_characteristics_hex": "00",
|
|
|
|
"size_of_stack_reserve": 100000,
|
|
|
|
"size_of_stack_commit": 8192,
|
|
|
|
"size_of_heap_reserve": 100000,
|
|
|
|
"size_of_heap_commit": 4096,
|
|
|
|
"loader_flags_hex": "abdbffde",
|
2018-07-13 17:10:05 +02:00
|
|
|
"number_of_rva_and_sizes": 3758087646,
|
2018-07-05 21:23:25 +02:00
|
|
|
},
|
|
|
|
"sections": [
|
|
|
|
{
|
|
|
|
"name": "CODE",
|
2018-07-13 17:10:05 +02:00
|
|
|
"entropy": 0.061089,
|
2018-07-05 21:23:25 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"name": "DATA",
|
2018-07-13 17:10:05 +02:00
|
|
|
"entropy": 7.980693,
|
2018-07-05 21:23:25 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"name": "NicolasB",
|
2018-07-13 17:10:05 +02:00
|
|
|
"entropy": 0.607433,
|
2018-07-05 21:23:25 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"name": ".idata",
|
2018-07-13 17:10:05 +02:00
|
|
|
"entropy": 0.607433,
|
|
|
|
},
|
|
|
|
],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
)
|
2017-05-16 18:39:04 +02:00
|
|
|
assert f.name == "qwerty.dll"
|
|
|
|
assert f.extensions["windows-pebinary-ext"].sections[2].entropy == 0.607433
|
|
|
|
|
|
|
|
|
2017-05-09 21:28:32 +02:00
|
|
|
def test_file_example_encryption_error():
|
2017-06-02 19:47:08 +02:00
|
|
|
with pytest.raises(stix2.exceptions.DependentPropertiesError) as excinfo:
|
2018-07-05 21:23:25 +02:00
|
|
|
stix2.v20.File(
|
|
|
|
name="qwerty.dll",
|
|
|
|
is_encrypted=False,
|
2018-07-13 17:10:05 +02:00
|
|
|
encryption_algorithm="AES128-CBC",
|
|
|
|
)
|
2017-05-09 21:28:32 +02:00
|
|
|
|
2018-07-05 21:23:25 +02:00
|
|
|
assert excinfo.value.cls == stix2.v20.File
|
2017-06-02 19:47:08 +02:00
|
|
|
assert excinfo.value.dependencies == [("is_encrypted", "encryption_algorithm")]
|
2017-08-24 23:53:43 +02:00
|
|
|
assert "property dependencies" in str(excinfo.value)
|
|
|
|
assert "are not met" in str(excinfo.value)
|
2017-05-09 03:03:15 +02:00
|
|
|
|
2017-06-07 17:06:20 +02:00
|
|
|
with pytest.raises(stix2.exceptions.DependentPropertiesError) as excinfo:
|
2018-07-05 21:23:25 +02:00
|
|
|
stix2.v20.File(
|
|
|
|
name="qwerty.dll",
|
2018-07-13 17:10:05 +02:00
|
|
|
encryption_algorithm="AES128-CBC",
|
|
|
|
)
|
2017-06-07 17:06:20 +02:00
|
|
|
|
2017-05-09 03:03:15 +02:00
|
|
|
|
|
|
|
def test_ip4_address_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
ip4 = stix2.v20.IPv4Address(
|
|
|
|
_valid_refs={"4": "mac-addr", "5": "mac-addr"},
|
|
|
|
value="198.51.100.3",
|
2018-07-13 17:10:05 +02:00
|
|
|
resolves_to_refs=["4", "5"],
|
|
|
|
)
|
2017-05-09 03:03:15 +02:00
|
|
|
|
|
|
|
assert ip4.value == "198.51.100.3"
|
|
|
|
assert ip4.resolves_to_refs == ["4", "5"]
|
|
|
|
|
|
|
|
|
2019-05-13 15:18:50 +02:00
|
|
|
def test_ip4_address_valid_refs():
|
|
|
|
mac1 = stix2.v20.MACAddress(
|
|
|
|
value="a1:b2:c3:d4:e5:f6",
|
|
|
|
)
|
|
|
|
mac2 = stix2.v20.MACAddress(
|
|
|
|
value="a7:b8:c9:d0:e1:f2",
|
|
|
|
)
|
|
|
|
|
|
|
|
ip4 = stix2.v20.IPv4Address(
|
|
|
|
_valid_refs={"1": mac1, "2": mac2},
|
|
|
|
value="177.60.40.7",
|
|
|
|
resolves_to_refs=["1", "2"],
|
|
|
|
)
|
|
|
|
|
|
|
|
assert ip4.value == "177.60.40.7"
|
|
|
|
assert ip4.resolves_to_refs == ["1", "2"]
|
|
|
|
|
|
|
|
|
2017-05-09 03:03:15 +02:00
|
|
|
def test_ip4_address_example_cidr():
|
2018-07-05 21:23:25 +02:00
|
|
|
ip4 = stix2.v20.IPv4Address(value="198.51.100.0/24")
|
2017-05-09 03:03:15 +02:00
|
|
|
|
|
|
|
assert ip4.value == "198.51.100.0/24"
|
|
|
|
|
|
|
|
|
|
|
|
def test_ip6_address_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
ip6 = stix2.v20.IPv6Address(value="2001:0db8:85a3:0000:0000:8a2e:0370:7334")
|
2017-05-09 03:03:15 +02:00
|
|
|
|
|
|
|
assert ip6.value == "2001:0db8:85a3:0000:0000:8a2e:0370:7334"
|
|
|
|
|
|
|
|
|
|
|
|
def test_mac_address_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
ip6 = stix2.v20.MACAddress(value="d2:fb:49:24:37:18")
|
2017-05-09 03:03:15 +02:00
|
|
|
|
|
|
|
assert ip6.value == "d2:fb:49:24:37:18"
|
|
|
|
|
|
|
|
|
2017-05-16 17:35:43 +02:00
|
|
|
def test_network_traffic_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
nt = stix2.v20.NetworkTraffic(
|
|
|
|
_valid_refs={"0": "ipv4-addr", "1": "ipv4-addr"},
|
|
|
|
protocols="tcp",
|
|
|
|
src_ref="0",
|
2018-07-13 17:10:05 +02:00
|
|
|
dst_ref="1",
|
|
|
|
)
|
2017-05-16 17:35:43 +02:00
|
|
|
assert nt.protocols == ["tcp"]
|
|
|
|
assert nt.src_ref == "0"
|
|
|
|
assert nt.dst_ref == "1"
|
|
|
|
|
|
|
|
|
|
|
|
def test_network_traffic_http_request_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
h = stix2.v20.HTTPRequestExt(
|
|
|
|
request_method="get",
|
|
|
|
request_value="/download.html",
|
|
|
|
request_version="http/1.1",
|
|
|
|
request_header={
|
|
|
|
"Accept-Encoding": "gzip,deflate",
|
|
|
|
"User-Agent": "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.6) Gecko/20040113",
|
2018-07-13 17:10:05 +02:00
|
|
|
"Host": "www.example.com",
|
|
|
|
},
|
|
|
|
)
|
2018-07-05 21:23:25 +02:00
|
|
|
nt = stix2.v20.NetworkTraffic(
|
|
|
|
_valid_refs={"0": "ipv4-addr"},
|
|
|
|
protocols="tcp",
|
|
|
|
src_ref="0",
|
2018-07-13 17:10:05 +02:00
|
|
|
extensions={'http-request-ext': h},
|
|
|
|
)
|
2017-05-16 17:35:43 +02:00
|
|
|
assert nt.extensions['http-request-ext'].request_method == "get"
|
|
|
|
assert nt.extensions['http-request-ext'].request_value == "/download.html"
|
|
|
|
assert nt.extensions['http-request-ext'].request_version == "http/1.1"
|
|
|
|
assert nt.extensions['http-request-ext'].request_header['Accept-Encoding'] == "gzip,deflate"
|
|
|
|
assert nt.extensions['http-request-ext'].request_header['User-Agent'] == "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.6) Gecko/20040113"
|
|
|
|
assert nt.extensions['http-request-ext'].request_header['Host'] == "www.example.com"
|
|
|
|
|
|
|
|
|
|
|
|
def test_network_traffic_icmp_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
h = stix2.v20.ICMPExt(icmp_type_hex="08", icmp_code_hex="00")
|
|
|
|
nt = stix2.v20.NetworkTraffic(
|
|
|
|
_valid_refs={"0": "ipv4-addr"},
|
|
|
|
protocols="tcp",
|
|
|
|
src_ref="0",
|
2018-07-13 17:10:05 +02:00
|
|
|
extensions={'icmp-ext': h},
|
|
|
|
)
|
2017-05-16 17:35:43 +02:00
|
|
|
assert nt.extensions['icmp-ext'].icmp_type_hex == "08"
|
|
|
|
assert nt.extensions['icmp-ext'].icmp_code_hex == "00"
|
|
|
|
|
|
|
|
|
|
|
|
def test_network_traffic_socket_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
h = stix2.v20.SocketExt(
|
|
|
|
is_listening=True,
|
|
|
|
address_family="AF_INET",
|
|
|
|
protocol_family="PF_INET",
|
2018-07-13 17:10:05 +02:00
|
|
|
socket_type="SOCK_STREAM",
|
|
|
|
)
|
2018-07-05 21:23:25 +02:00
|
|
|
nt = stix2.v20.NetworkTraffic(
|
|
|
|
_valid_refs={"0": "ipv4-addr"},
|
|
|
|
protocols="tcp",
|
|
|
|
src_ref="0",
|
2018-07-13 17:10:05 +02:00
|
|
|
extensions={'socket-ext': h},
|
|
|
|
)
|
2017-05-16 17:35:43 +02:00
|
|
|
assert nt.extensions['socket-ext'].is_listening
|
|
|
|
assert nt.extensions['socket-ext'].address_family == "AF_INET"
|
|
|
|
assert nt.extensions['socket-ext'].protocol_family == "PF_INET"
|
|
|
|
assert nt.extensions['socket-ext'].socket_type == "SOCK_STREAM"
|
|
|
|
|
|
|
|
|
|
|
|
def test_network_traffic_tcp_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
h = stix2.v20.TCPExt(src_flags_hex="00000002")
|
|
|
|
nt = stix2.v20.NetworkTraffic(
|
|
|
|
_valid_refs={"0": "ipv4-addr"},
|
|
|
|
protocols="tcp",
|
|
|
|
src_ref="0",
|
2018-07-13 17:10:05 +02:00
|
|
|
extensions={'tcp-ext': h},
|
|
|
|
)
|
2017-05-16 17:35:43 +02:00
|
|
|
assert nt.extensions['tcp-ext'].src_flags_hex == "00000002"
|
|
|
|
|
|
|
|
|
2017-05-09 03:03:15 +02:00
|
|
|
def test_mutex_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
m = stix2.v20.Mutex(name="barney")
|
2017-05-09 03:03:15 +02:00
|
|
|
|
|
|
|
assert m.name == "barney"
|
|
|
|
|
|
|
|
|
2017-05-17 21:33:28 +02:00
|
|
|
def test_process_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
p = stix2.v20.Process(
|
|
|
|
_valid_refs={"0": "file"},
|
|
|
|
pid=1221,
|
|
|
|
name="gedit-bin",
|
|
|
|
created="2016-01-20T14:11:25.55Z",
|
|
|
|
arguments=["--new-window"],
|
2018-07-13 17:10:05 +02:00
|
|
|
binary_ref="0",
|
|
|
|
)
|
2017-05-17 21:33:28 +02:00
|
|
|
|
|
|
|
assert p.name == "gedit-bin"
|
|
|
|
assert p.arguments == ["--new-window"]
|
|
|
|
|
|
|
|
|
|
|
|
def test_process_example_empty_error():
|
|
|
|
with pytest.raises(stix2.exceptions.AtLeastOnePropertyError) as excinfo:
|
2018-07-05 21:23:25 +02:00
|
|
|
stix2.v20.Process()
|
2017-05-17 21:33:28 +02:00
|
|
|
|
2018-07-05 21:23:25 +02:00
|
|
|
assert excinfo.value.cls == stix2.v20.Process
|
|
|
|
properties_of_process = list(stix2.v20.Process._properties.keys())
|
2017-05-17 21:33:28 +02:00
|
|
|
properties_of_process.remove("type")
|
2017-05-18 17:24:43 +02:00
|
|
|
assert excinfo.value.properties == sorted(properties_of_process)
|
2017-08-29 21:15:32 +02:00
|
|
|
msg = "At least one of the ({1}) properties for {0} must be populated."
|
2018-07-13 17:10:05 +02:00
|
|
|
msg = msg.format(
|
|
|
|
stix2.v20.Process.__name__,
|
|
|
|
", ".join(sorted(properties_of_process)),
|
|
|
|
)
|
2017-08-29 21:15:32 +02:00
|
|
|
assert str(excinfo.value) == msg
|
2017-05-17 21:33:28 +02:00
|
|
|
|
|
|
|
|
|
|
|
def test_process_example_empty_with_extensions():
|
Improved the exception class hierarchy:
- Removed all plain python base classes (e.g. ValueError, TypeError)
- Renamed InvalidPropertyConfigurationError -> PropertyPresenceError,
since incorrect values could be considered a property config error, and
I really just wanted this class to apply to presence (co-)constraint
violations.
- Added ObjectConfigurationError as a superclass of InvalidValueError,
PropertyPresenceError, and any other exception that could be raised
during _STIXBase object init, which is when the spec compliance
checks happen. This class is intended to represent general spec
violations.
- Did some class reordering in exceptions.py, so all the
ObjectConfigurationError subclasses were together.
Changed how property "cleaning" errors were handled:
- Previous docs said they should all be ValueErrors, but that would require
extra exception check-and-replace complexity in the property
implementations, so that requirement is removed. Doc is changed to just
say that cleaning problems should cause exceptions to be raised.
_STIXBase._check_property() now handles most exception types, not just
ValueError.
- Decided to try chaining the original clean error to the InvalidValueError,
in case the extra diagnostics would be helpful in the future. This is
done via 'six' adapter function and only works on python3.
- A small amount of testing was removed, since it was looking at custom
exception properties which became unavailable once the exception was
replaced with InvalidValueError.
Did another pass through unit tests to fix breakage caused by the changed
exception class hierarchy.
Removed unnecessary observable extension handling code from
parse_observable(), since it was all duplicated in ExtensionsProperty.
The redundant code in parse_observable() had different exception behavior
than ExtensionsProperty, which makes the API inconsistent and unit tests
more complicated. (Problems in ExtensionsProperty get replaced with
InvalidValueError, but extensions problems handled directly in
parse_observable() don't get the same replacement, and so the exception
type is different.)
Redid the workbench monkeypatching. The old way was impossible to make
work, and had caused ugly ripple effect hackage in other parts of the
codebase. Now, it replaces the global object maps with factory functions
which behave the same way when called, as real classes. Had to fix up a
few unit tests to get them all passing with this monkeypatching in place.
Also remove all the xfail markings in the workbench test suite, since all
tests now pass.
Since workbench monkeypatching isn't currently affecting any unit tests,
tox.ini was simplified to remove the special-casing for running the
workbench tests.
Removed the v20 workbench test suite, since the workbench currently only
works with the latest stix object version.
2019-07-19 20:50:11 +02:00
|
|
|
with pytest.raises(InvalidValueError) as excinfo:
|
2019-02-06 21:23:00 +01:00
|
|
|
stix2.v20.Process(
|
|
|
|
extensions={
|
|
|
|
"windows-process-ext": {},
|
|
|
|
},
|
|
|
|
)
|
2017-05-17 21:33:28 +02:00
|
|
|
|
Improved the exception class hierarchy:
- Removed all plain python base classes (e.g. ValueError, TypeError)
- Renamed InvalidPropertyConfigurationError -> PropertyPresenceError,
since incorrect values could be considered a property config error, and
I really just wanted this class to apply to presence (co-)constraint
violations.
- Added ObjectConfigurationError as a superclass of InvalidValueError,
PropertyPresenceError, and any other exception that could be raised
during _STIXBase object init, which is when the spec compliance
checks happen. This class is intended to represent general spec
violations.
- Did some class reordering in exceptions.py, so all the
ObjectConfigurationError subclasses were together.
Changed how property "cleaning" errors were handled:
- Previous docs said they should all be ValueErrors, but that would require
extra exception check-and-replace complexity in the property
implementations, so that requirement is removed. Doc is changed to just
say that cleaning problems should cause exceptions to be raised.
_STIXBase._check_property() now handles most exception types, not just
ValueError.
- Decided to try chaining the original clean error to the InvalidValueError,
in case the extra diagnostics would be helpful in the future. This is
done via 'six' adapter function and only works on python3.
- A small amount of testing was removed, since it was looking at custom
exception properties which became unavailable once the exception was
replaced with InvalidValueError.
Did another pass through unit tests to fix breakage caused by the changed
exception class hierarchy.
Removed unnecessary observable extension handling code from
parse_observable(), since it was all duplicated in ExtensionsProperty.
The redundant code in parse_observable() had different exception behavior
than ExtensionsProperty, which makes the API inconsistent and unit tests
more complicated. (Problems in ExtensionsProperty get replaced with
InvalidValueError, but extensions problems handled directly in
parse_observable() don't get the same replacement, and so the exception
type is different.)
Redid the workbench monkeypatching. The old way was impossible to make
work, and had caused ugly ripple effect hackage in other parts of the
codebase. Now, it replaces the global object maps with factory functions
which behave the same way when called, as real classes. Had to fix up a
few unit tests to get them all passing with this monkeypatching in place.
Also remove all the xfail markings in the workbench test suite, since all
tests now pass.
Since workbench monkeypatching isn't currently affecting any unit tests,
tox.ini was simplified to remove the special-casing for running the
workbench tests.
Removed the v20 workbench test suite, since the workbench currently only
works with the latest stix object version.
2019-07-19 20:50:11 +02:00
|
|
|
assert excinfo.value.cls == stix2.v20.Process
|
2017-05-17 21:33:28 +02:00
|
|
|
|
|
|
|
|
2017-06-08 16:09:18 +02:00
|
|
|
def test_process_example_windows_process_ext():
|
2018-07-05 21:23:25 +02:00
|
|
|
proc = stix2.v20.Process(
|
|
|
|
pid=314,
|
|
|
|
name="foobar.exe",
|
|
|
|
extensions={
|
|
|
|
"windows-process-ext": {
|
|
|
|
"aslr_enabled": True,
|
|
|
|
"dep_enabled": True,
|
|
|
|
"priority": "HIGH_PRIORITY_CLASS",
|
2018-07-13 17:10:05 +02:00
|
|
|
"owner_sid": "S-1-5-21-186985262-1144665072-74031268-1309",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
)
|
2017-06-08 16:09:18 +02:00
|
|
|
assert proc.extensions["windows-process-ext"].aslr_enabled
|
|
|
|
assert proc.extensions["windows-process-ext"].dep_enabled
|
|
|
|
assert proc.extensions["windows-process-ext"].priority == "HIGH_PRIORITY_CLASS"
|
|
|
|
assert proc.extensions["windows-process-ext"].owner_sid == "S-1-5-21-186985262-1144665072-74031268-1309"
|
|
|
|
|
|
|
|
|
2017-05-17 21:33:28 +02:00
|
|
|
def test_process_example_windows_process_ext_empty():
|
Improved the exception class hierarchy:
- Removed all plain python base classes (e.g. ValueError, TypeError)
- Renamed InvalidPropertyConfigurationError -> PropertyPresenceError,
since incorrect values could be considered a property config error, and
I really just wanted this class to apply to presence (co-)constraint
violations.
- Added ObjectConfigurationError as a superclass of InvalidValueError,
PropertyPresenceError, and any other exception that could be raised
during _STIXBase object init, which is when the spec compliance
checks happen. This class is intended to represent general spec
violations.
- Did some class reordering in exceptions.py, so all the
ObjectConfigurationError subclasses were together.
Changed how property "cleaning" errors were handled:
- Previous docs said they should all be ValueErrors, but that would require
extra exception check-and-replace complexity in the property
implementations, so that requirement is removed. Doc is changed to just
say that cleaning problems should cause exceptions to be raised.
_STIXBase._check_property() now handles most exception types, not just
ValueError.
- Decided to try chaining the original clean error to the InvalidValueError,
in case the extra diagnostics would be helpful in the future. This is
done via 'six' adapter function and only works on python3.
- A small amount of testing was removed, since it was looking at custom
exception properties which became unavailable once the exception was
replaced with InvalidValueError.
Did another pass through unit tests to fix breakage caused by the changed
exception class hierarchy.
Removed unnecessary observable extension handling code from
parse_observable(), since it was all duplicated in ExtensionsProperty.
The redundant code in parse_observable() had different exception behavior
than ExtensionsProperty, which makes the API inconsistent and unit tests
more complicated. (Problems in ExtensionsProperty get replaced with
InvalidValueError, but extensions problems handled directly in
parse_observable() don't get the same replacement, and so the exception
type is different.)
Redid the workbench monkeypatching. The old way was impossible to make
work, and had caused ugly ripple effect hackage in other parts of the
codebase. Now, it replaces the global object maps with factory functions
which behave the same way when called, as real classes. Had to fix up a
few unit tests to get them all passing with this monkeypatching in place.
Also remove all the xfail markings in the workbench test suite, since all
tests now pass.
Since workbench monkeypatching isn't currently affecting any unit tests,
tox.ini was simplified to remove the special-casing for running the
workbench tests.
Removed the v20 workbench test suite, since the workbench currently only
works with the latest stix object version.
2019-07-19 20:50:11 +02:00
|
|
|
with pytest.raises(InvalidValueError) as excinfo:
|
2019-02-06 21:23:00 +01:00
|
|
|
stix2.v20.Process(
|
|
|
|
pid=1221,
|
|
|
|
name="gedit-bin",
|
|
|
|
extensions={
|
|
|
|
"windows-process-ext": {},
|
|
|
|
},
|
|
|
|
)
|
2018-07-05 21:23:25 +02:00
|
|
|
|
Improved the exception class hierarchy:
- Removed all plain python base classes (e.g. ValueError, TypeError)
- Renamed InvalidPropertyConfigurationError -> PropertyPresenceError,
since incorrect values could be considered a property config error, and
I really just wanted this class to apply to presence (co-)constraint
violations.
- Added ObjectConfigurationError as a superclass of InvalidValueError,
PropertyPresenceError, and any other exception that could be raised
during _STIXBase object init, which is when the spec compliance
checks happen. This class is intended to represent general spec
violations.
- Did some class reordering in exceptions.py, so all the
ObjectConfigurationError subclasses were together.
Changed how property "cleaning" errors were handled:
- Previous docs said they should all be ValueErrors, but that would require
extra exception check-and-replace complexity in the property
implementations, so that requirement is removed. Doc is changed to just
say that cleaning problems should cause exceptions to be raised.
_STIXBase._check_property() now handles most exception types, not just
ValueError.
- Decided to try chaining the original clean error to the InvalidValueError,
in case the extra diagnostics would be helpful in the future. This is
done via 'six' adapter function and only works on python3.
- A small amount of testing was removed, since it was looking at custom
exception properties which became unavailable once the exception was
replaced with InvalidValueError.
Did another pass through unit tests to fix breakage caused by the changed
exception class hierarchy.
Removed unnecessary observable extension handling code from
parse_observable(), since it was all duplicated in ExtensionsProperty.
The redundant code in parse_observable() had different exception behavior
than ExtensionsProperty, which makes the API inconsistent and unit tests
more complicated. (Problems in ExtensionsProperty get replaced with
InvalidValueError, but extensions problems handled directly in
parse_observable() don't get the same replacement, and so the exception
type is different.)
Redid the workbench monkeypatching. The old way was impossible to make
work, and had caused ugly ripple effect hackage in other parts of the
codebase. Now, it replaces the global object maps with factory functions
which behave the same way when called, as real classes. Had to fix up a
few unit tests to get them all passing with this monkeypatching in place.
Also remove all the xfail markings in the workbench test suite, since all
tests now pass.
Since workbench monkeypatching isn't currently affecting any unit tests,
tox.ini was simplified to remove the special-casing for running the
workbench tests.
Removed the v20 workbench test suite, since the workbench currently only
works with the latest stix object version.
2019-07-19 20:50:11 +02:00
|
|
|
assert excinfo.value.cls == stix2.v20.Process
|
2017-05-17 21:33:28 +02:00
|
|
|
|
|
|
|
|
2019-01-07 21:22:08 +01:00
|
|
|
def test_process_example_extensions_empty():
|
|
|
|
proc = stix2.v20.Process(
|
|
|
|
pid=314,
|
|
|
|
name="foobar.exe",
|
|
|
|
extensions={},
|
|
|
|
)
|
|
|
|
|
|
|
|
assert '{}' in str(proc)
|
|
|
|
|
|
|
|
|
2017-05-16 18:39:04 +02:00
|
|
|
def test_process_example_with_WindowsProcessExt_Object():
|
2018-07-05 21:23:25 +02:00
|
|
|
p = stix2.v20.Process(extensions={
|
|
|
|
"windows-process-ext": stix2.v20.WindowsProcessExt(
|
|
|
|
aslr_enabled=True,
|
|
|
|
dep_enabled=True,
|
|
|
|
priority="HIGH_PRIORITY_CLASS",
|
2018-07-13 17:10:05 +02:00
|
|
|
owner_sid="S-1-5-21-186985262-1144665072-74031268-1309",
|
|
|
|
), # noqa
|
2018-07-05 21:23:25 +02:00
|
|
|
})
|
2017-05-16 18:39:04 +02:00
|
|
|
|
2017-05-17 21:33:28 +02:00
|
|
|
assert p.extensions["windows-process-ext"].dep_enabled
|
|
|
|
assert p.extensions["windows-process-ext"].owner_sid == "S-1-5-21-186985262-1144665072-74031268-1309"
|
2017-05-16 18:39:04 +02:00
|
|
|
|
|
|
|
|
|
|
|
def test_process_example_with_WindowsServiceExt():
|
2018-07-05 21:23:25 +02:00
|
|
|
p = stix2.v20.Process(extensions={
|
|
|
|
"windows-service-ext": {
|
|
|
|
"service_name": "sirvizio",
|
|
|
|
"display_name": "Sirvizio",
|
|
|
|
"start_type": "SERVICE_AUTO_START",
|
|
|
|
"service_type": "SERVICE_WIN32_OWN_PROCESS",
|
2018-07-13 17:10:05 +02:00
|
|
|
"service_status": "SERVICE_RUNNING",
|
|
|
|
},
|
2017-05-16 18:39:04 +02:00
|
|
|
})
|
|
|
|
|
2017-05-17 21:33:28 +02:00
|
|
|
assert p.extensions["windows-service-ext"].service_name == "sirvizio"
|
|
|
|
assert p.extensions["windows-service-ext"].service_type == "SERVICE_WIN32_OWN_PROCESS"
|
2017-05-16 18:39:04 +02:00
|
|
|
|
|
|
|
|
|
|
|
def test_process_example_with_WindowsProcessServiceExt():
|
2018-07-05 21:23:25 +02:00
|
|
|
p = stix2.v20.Process(extensions={
|
2017-05-16 18:39:04 +02:00
|
|
|
"windows-service-ext": {
|
|
|
|
"service_name": "sirvizio",
|
|
|
|
"display_name": "Sirvizio",
|
|
|
|
"start_type": "SERVICE_AUTO_START",
|
|
|
|
"service_type": "SERVICE_WIN32_OWN_PROCESS",
|
2018-07-13 17:10:05 +02:00
|
|
|
"service_status": "SERVICE_RUNNING",
|
2017-05-16 18:39:04 +02:00
|
|
|
},
|
|
|
|
"windows-process-ext": {
|
|
|
|
"aslr_enabled": True,
|
|
|
|
"dep_enabled": True,
|
|
|
|
"priority": "HIGH_PRIORITY_CLASS",
|
2018-07-13 17:10:05 +02:00
|
|
|
"owner_sid": "S-1-5-21-186985262-1144665072-74031268-1309",
|
|
|
|
},
|
2017-05-16 18:39:04 +02:00
|
|
|
})
|
|
|
|
|
2017-05-17 21:33:28 +02:00
|
|
|
assert p.extensions["windows-service-ext"].service_name == "sirvizio"
|
|
|
|
assert p.extensions["windows-service-ext"].service_type == "SERVICE_WIN32_OWN_PROCESS"
|
|
|
|
assert p.extensions["windows-process-ext"].dep_enabled
|
|
|
|
assert p.extensions["windows-process-ext"].owner_sid == "S-1-5-21-186985262-1144665072-74031268-1309"
|
2017-05-16 18:39:04 +02:00
|
|
|
|
|
|
|
|
2017-05-09 03:03:15 +02:00
|
|
|
def test_software_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
s = stix2.v20.Software(
|
|
|
|
name="Word",
|
|
|
|
cpe="cpe:2.3:a:microsoft:word:2000:*:*:*:*:*:*:*",
|
|
|
|
version="2002",
|
2018-07-13 17:10:05 +02:00
|
|
|
vendor="Microsoft",
|
|
|
|
)
|
2017-05-09 03:03:15 +02:00
|
|
|
|
|
|
|
assert s.name == "Word"
|
|
|
|
assert s.cpe == "cpe:2.3:a:microsoft:word:2000:*:*:*:*:*:*:*"
|
|
|
|
assert s.version == "2002"
|
|
|
|
assert s.vendor == "Microsoft"
|
2017-05-10 17:52:59 +02:00
|
|
|
|
|
|
|
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
def test_url_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
s = stix2.v20.URL(value="https://example.com/research/index.html")
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
|
|
|
|
assert s.type == "url"
|
|
|
|
assert s.value == "https://example.com/research/index.html"
|
|
|
|
|
|
|
|
|
|
|
|
def test_user_account_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
a = stix2.v20.UserAccount(
|
|
|
|
user_id="1001",
|
|
|
|
account_login="jdoe",
|
|
|
|
account_type="unix",
|
|
|
|
display_name="John Doe",
|
|
|
|
is_service_account=False,
|
|
|
|
is_privileged=False,
|
|
|
|
can_escalate_privs=True,
|
|
|
|
account_created="2016-01-20T12:31:12Z",
|
|
|
|
password_last_changed="2016-01-20T14:27:43Z",
|
|
|
|
account_first_login="2016-01-20T14:26:07Z",
|
2018-07-13 17:10:05 +02:00
|
|
|
account_last_login="2016-07-22T16:08:28Z",
|
|
|
|
)
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
|
|
|
|
assert a.user_id == "1001"
|
|
|
|
assert a.account_login == "jdoe"
|
|
|
|
assert a.account_type == "unix"
|
|
|
|
assert a.display_name == "John Doe"
|
|
|
|
assert not a.is_service_account
|
|
|
|
assert not a.is_privileged
|
|
|
|
assert a.can_escalate_privs
|
|
|
|
assert a.account_created == dt.datetime(2016, 1, 20, 12, 31, 12, tzinfo=pytz.utc)
|
|
|
|
assert a.password_last_changed == dt.datetime(2016, 1, 20, 14, 27, 43, tzinfo=pytz.utc)
|
|
|
|
assert a.account_first_login == dt.datetime(2016, 1, 20, 14, 26, 7, tzinfo=pytz.utc)
|
|
|
|
assert a.account_last_login == dt.datetime(2016, 7, 22, 16, 8, 28, tzinfo=pytz.utc)
|
2017-05-11 21:42:56 +02:00
|
|
|
|
|
|
|
|
2017-05-16 17:35:43 +02:00
|
|
|
def test_user_account_unix_account_ext_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
u = stix2.v20.UNIXAccountExt(
|
|
|
|
gid=1001,
|
|
|
|
groups=["wheel"],
|
|
|
|
home_dir="/home/jdoe",
|
2018-07-13 17:10:05 +02:00
|
|
|
shell="/bin/bash",
|
|
|
|
)
|
2018-07-05 21:23:25 +02:00
|
|
|
a = stix2.v20.UserAccount(
|
|
|
|
user_id="1001",
|
|
|
|
account_login="jdoe",
|
|
|
|
account_type="unix",
|
2018-07-13 17:10:05 +02:00
|
|
|
extensions={'unix-account-ext': u},
|
|
|
|
)
|
2017-05-16 17:35:43 +02:00
|
|
|
assert a.extensions['unix-account-ext'].gid == 1001
|
|
|
|
assert a.extensions['unix-account-ext'].groups == ["wheel"]
|
|
|
|
assert a.extensions['unix-account-ext'].home_dir == "/home/jdoe"
|
|
|
|
assert a.extensions['unix-account-ext'].shell == "/bin/bash"
|
|
|
|
|
|
|
|
|
2017-05-10 17:52:59 +02:00
|
|
|
def test_windows_registry_key_example():
|
Improved the exception class hierarchy:
- Removed all plain python base classes (e.g. ValueError, TypeError)
- Renamed InvalidPropertyConfigurationError -> PropertyPresenceError,
since incorrect values could be considered a property config error, and
I really just wanted this class to apply to presence (co-)constraint
violations.
- Added ObjectConfigurationError as a superclass of InvalidValueError,
PropertyPresenceError, and any other exception that could be raised
during _STIXBase object init, which is when the spec compliance
checks happen. This class is intended to represent general spec
violations.
- Did some class reordering in exceptions.py, so all the
ObjectConfigurationError subclasses were together.
Changed how property "cleaning" errors were handled:
- Previous docs said they should all be ValueErrors, but that would require
extra exception check-and-replace complexity in the property
implementations, so that requirement is removed. Doc is changed to just
say that cleaning problems should cause exceptions to be raised.
_STIXBase._check_property() now handles most exception types, not just
ValueError.
- Decided to try chaining the original clean error to the InvalidValueError,
in case the extra diagnostics would be helpful in the future. This is
done via 'six' adapter function and only works on python3.
- A small amount of testing was removed, since it was looking at custom
exception properties which became unavailable once the exception was
replaced with InvalidValueError.
Did another pass through unit tests to fix breakage caused by the changed
exception class hierarchy.
Removed unnecessary observable extension handling code from
parse_observable(), since it was all duplicated in ExtensionsProperty.
The redundant code in parse_observable() had different exception behavior
than ExtensionsProperty, which makes the API inconsistent and unit tests
more complicated. (Problems in ExtensionsProperty get replaced with
InvalidValueError, but extensions problems handled directly in
parse_observable() don't get the same replacement, and so the exception
type is different.)
Redid the workbench monkeypatching. The old way was impossible to make
work, and had caused ugly ripple effect hackage in other parts of the
codebase. Now, it replaces the global object maps with factory functions
which behave the same way when called, as real classes. Had to fix up a
few unit tests to get them all passing with this monkeypatching in place.
Also remove all the xfail markings in the workbench test suite, since all
tests now pass.
Since workbench monkeypatching isn't currently affecting any unit tests,
tox.ini was simplified to remove the special-casing for running the
workbench tests.
Removed the v20 workbench test suite, since the workbench currently only
works with the latest stix object version.
2019-07-19 20:50:11 +02:00
|
|
|
with pytest.raises(InvalidValueError):
|
2018-07-05 21:23:25 +02:00
|
|
|
stix2.v20.WindowsRegistryValueType(
|
|
|
|
name="Foo",
|
|
|
|
data="qwerty",
|
2018-07-13 17:10:05 +02:00
|
|
|
data_type="string",
|
|
|
|
)
|
2018-07-05 21:23:25 +02:00
|
|
|
|
|
|
|
v = stix2.v20.WindowsRegistryValueType(
|
|
|
|
name="Foo",
|
|
|
|
data="qwerty",
|
2018-07-13 17:10:05 +02:00
|
|
|
data_type="REG_SZ",
|
|
|
|
)
|
2018-07-05 21:23:25 +02:00
|
|
|
w = stix2.v20.WindowsRegistryKey(
|
|
|
|
key="hkey_local_machine\\system\\bar\\foo",
|
2018-07-13 17:10:05 +02:00
|
|
|
values=[v],
|
|
|
|
)
|
2017-05-10 17:52:59 +02:00
|
|
|
assert w.key == "hkey_local_machine\\system\\bar\\foo"
|
|
|
|
assert w.values[0].name == "Foo"
|
|
|
|
assert w.values[0].data == "qwerty"
|
|
|
|
assert w.values[0].data_type == "REG_SZ"
|
2018-12-21 20:33:59 +01:00
|
|
|
# ensure no errors in serialization because of 'values'
|
|
|
|
assert "Foo" in str(w)
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
|
|
|
|
|
|
|
|
def test_x509_certificate_example():
|
2018-07-05 21:23:25 +02:00
|
|
|
x509 = stix2.v20.X509Certificate(
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
issuer="C=ZA, ST=Western Cape, L=Cape Town, O=Thawte Consulting cc, OU=Certification Services Division, CN=Thawte Server CA/emailAddress=server-certs@thawte.com", # noqa
|
|
|
|
validity_not_before="2016-03-12T12:00:00Z",
|
|
|
|
validity_not_after="2016-08-21T12:00:00Z",
|
2018-07-13 17:10:05 +02:00
|
|
|
subject="C=US, ST=Maryland, L=Pasadena, O=Brent Baccala, OU=FreeSoft, CN=www.freesoft.org/emailAddress=baccala@freesoft.org",
|
|
|
|
) # noqa
|
Changes so File object creation doesn't violate on of the MUSTs
Added three new exceptions: DependentPropertiestError, AtLeastOnePropertyError, MutuallyExclusivePropertiesError
Added tests for NetworkTraffic, Process, URL, WindowsRegistryKey and X509Certificate
Added error tests for EmailMessage, NetworkTraffic, Artifact,
Added interproperty checker methods to the base class: _check_mutually_exclusive_properties, _check_at_least_one_property and _check_properties_dependency
Added interproperty checkers to Artifact, EmailMIMEComponent, EmailMessage, NetworkTraffic
Made NetworkTraffic.protocols required
Added X509V3ExtenstionsType class
Use EmbeddedObjectProperty for X509Certificate.x509_v3_extensions
2017-05-11 21:22:46 +02:00
|
|
|
|
|
|
|
assert x509.type == "x509-certificate"
|
|
|
|
assert x509.issuer == "C=ZA, ST=Western Cape, L=Cape Town, O=Thawte Consulting cc, OU=Certification Services Division, CN=Thawte Server CA/emailAddress=server-certs@thawte.com" # noqa
|
|
|
|
assert x509.subject == "C=US, ST=Maryland, L=Pasadena, O=Brent Baccala, OU=FreeSoft, CN=www.freesoft.org/emailAddress=baccala@freesoft.org" # noqa
|
2018-02-19 20:44:28 +01:00
|
|
|
|
|
|
|
|
|
|
|
def test_new_version_with_related_objects():
|
2018-07-05 21:23:25 +02:00
|
|
|
data = stix2.v20.ObservedData(
|
2018-02-19 20:44:28 +01:00
|
|
|
first_observed="2016-03-12T12:00:00Z",
|
|
|
|
last_observed="2016-03-12T12:00:00Z",
|
|
|
|
number_observed=1,
|
|
|
|
objects={
|
|
|
|
'src_ip': {
|
|
|
|
'type': 'ipv4-addr',
|
2018-07-13 17:10:05 +02:00
|
|
|
'value': '127.0.0.1/32',
|
2018-02-19 20:44:28 +01:00
|
|
|
},
|
2018-02-19 21:03:20 +01:00
|
|
|
'domain': {
|
2018-02-19 20:44:28 +01:00
|
|
|
'type': 'domain-name',
|
|
|
|
'value': 'example.com',
|
2018-07-13 17:10:05 +02:00
|
|
|
'resolves_to_refs': ['src_ip'],
|
|
|
|
},
|
|
|
|
},
|
2018-02-19 20:44:28 +01:00
|
|
|
)
|
|
|
|
new_version = data.new_version(last_observed="2017-12-12T12:00:00Z")
|
|
|
|
assert new_version.last_observed.year == 2017
|
|
|
|
assert new_version.objects['domain'].resolves_to_refs[0] == 'src_ip'
|