|
|
|
@ -1314,15 +1314,16 @@ def test_unregistered_top_level_extension_passes_with_allow_custom_false():
|
|
|
|
|
pattern_type='stix',
|
|
|
|
|
valid_from='2014-02-20T09:00:00.000000Z',
|
|
|
|
|
extensions={
|
|
|
|
|
'stix-extension--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e': {
|
|
|
|
|
'extends_stix_object_definition': True,
|
|
|
|
|
'extension-definition--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e': {
|
|
|
|
|
'extension_type': 'toplevel-property-extension',
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
allow_custom=False,
|
|
|
|
|
)
|
|
|
|
|
assert indicator.rank == 5
|
|
|
|
|
assert indicator.toxicity == 8
|
|
|
|
|
assert isinstance(indicator.extensions['stix-extension--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e'], dict)
|
|
|
|
|
assert indicator.extensions['extension-definition--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e']['extension_type'] == 'toplevel-property-extension'
|
|
|
|
|
assert isinstance(indicator.extensions['extension-definition--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e'], dict)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_unregistered_embedded_extension_passes_with_allow_custom_false():
|
|
|
|
@ -1339,27 +1340,29 @@ def test_unregistered_embedded_extension_passes_with_allow_custom_false():
|
|
|
|
|
pattern_type='stix',
|
|
|
|
|
valid_from='2014-02-20T09:00:00.000000Z',
|
|
|
|
|
extensions={
|
|
|
|
|
'stix-extension--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e': {
|
|
|
|
|
'extension-definition--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e': {
|
|
|
|
|
'extension_type': 'property-extension',
|
|
|
|
|
'rank': 5,
|
|
|
|
|
'toxicity': 8,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
allow_custom=False,
|
|
|
|
|
)
|
|
|
|
|
assert indicator.extensions['stix-extension--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e']['rank'] == 5
|
|
|
|
|
assert indicator.extensions['stix-extension--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e']['toxicity'] == 8
|
|
|
|
|
assert isinstance(indicator.extensions['stix-extension--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e'], dict)
|
|
|
|
|
assert indicator.extensions['extension-definition--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e']['rank'] == 5
|
|
|
|
|
assert indicator.extensions['extension-definition--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e']['toxicity'] == 8
|
|
|
|
|
assert indicator.extensions['extension-definition--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e']['extension_type'] == 'property-extension'
|
|
|
|
|
assert isinstance(indicator.extensions['extension-definition--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e'], dict)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_registered_top_level_extension_passes_with_allow_custom_false():
|
|
|
|
|
@stix2.v21.CustomExtension(
|
|
|
|
|
'stix-extension--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e', [
|
|
|
|
|
('rank', stix2.properties.IntegerProperty(required=True)),
|
|
|
|
|
('toxicity', stix2.properties.IntegerProperty(required=True)),
|
|
|
|
|
'extension-definition--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e', [
|
|
|
|
|
('rank', stix2.properties.IntegerProperty(required=True)),
|
|
|
|
|
('toxicity', stix2.properties.IntegerProperty(required=True)),
|
|
|
|
|
],
|
|
|
|
|
)
|
|
|
|
|
class ExtensionFoo1:
|
|
|
|
|
extends_stix_object_definition = True
|
|
|
|
|
extension_type = 'toplevel-property-extension'
|
|
|
|
|
|
|
|
|
|
indicator = stix2.v21.Indicator(
|
|
|
|
|
id='indicator--e97bfccf-8970-4a3c-9cd1-5b5b97ed5d0c',
|
|
|
|
@ -1376,22 +1379,23 @@ def test_registered_top_level_extension_passes_with_allow_custom_false():
|
|
|
|
|
pattern_type='stix',
|
|
|
|
|
valid_from='2014-02-20T09:00:00.000000Z',
|
|
|
|
|
extensions={
|
|
|
|
|
'stix-extension--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e': {
|
|
|
|
|
'extends_stix_object_definition': True,
|
|
|
|
|
'extension-definition--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e': {
|
|
|
|
|
'extension_type': 'toplevel-property-extension',
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
allow_custom=False,
|
|
|
|
|
)
|
|
|
|
|
assert indicator.rank == 5
|
|
|
|
|
assert indicator.toxicity == 8
|
|
|
|
|
assert isinstance(indicator.extensions['stix-extension--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e'], ExtensionFoo1)
|
|
|
|
|
assert indicator.extensions['extension-definition--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e']['extension_type'] == 'toplevel-property-extension'
|
|
|
|
|
assert isinstance(indicator.extensions['extension-definition--d83fce45-ef58-4c6c-a3f4-1fbc32e98c6e'], ExtensionFoo1)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_registered_embedded_extension_passes_with_allow_custom_false():
|
|
|
|
|
@stix2.v21.CustomExtension(
|
|
|
|
|
'stix-extension--d83fce45-ef58-4c6c-a3ff-1fbc32e98c6e', [
|
|
|
|
|
('rank', stix2.properties.IntegerProperty(required=True)),
|
|
|
|
|
('toxicity', stix2.properties.IntegerProperty(required=True)),
|
|
|
|
|
'extension-definition--d83fce45-ef58-4c6c-a3ff-1fbc32e98c6e', [
|
|
|
|
|
('rank', stix2.properties.IntegerProperty(required=True)),
|
|
|
|
|
('toxicity', stix2.properties.IntegerProperty(required=True)),
|
|
|
|
|
],
|
|
|
|
|
)
|
|
|
|
|
class ExtensionFoo1:
|
|
|
|
@ -1410,16 +1414,18 @@ def test_registered_embedded_extension_passes_with_allow_custom_false():
|
|
|
|
|
pattern_type='stix',
|
|
|
|
|
valid_from='2014-02-20T09:00:00.000000Z',
|
|
|
|
|
extensions={
|
|
|
|
|
'stix-extension--d83fce45-ef58-4c6c-a3ff-1fbc32e98c6e': {
|
|
|
|
|
'extension-definition--d83fce45-ef58-4c6c-a3ff-1fbc32e98c6e': {
|
|
|
|
|
'extension_type': 'property-extension',
|
|
|
|
|
'rank': 5,
|
|
|
|
|
'toxicity': 8,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
allow_custom=False,
|
|
|
|
|
)
|
|
|
|
|
assert indicator.extensions['stix-extension--d83fce45-ef58-4c6c-a3ff-1fbc32e98c6e']['rank'] == 5
|
|
|
|
|
assert indicator.extensions['stix-extension--d83fce45-ef58-4c6c-a3ff-1fbc32e98c6e']['toxicity'] == 8
|
|
|
|
|
assert isinstance(indicator.extensions['stix-extension--d83fce45-ef58-4c6c-a3ff-1fbc32e98c6e'], ExtensionFoo1)
|
|
|
|
|
assert indicator.extensions['extension-definition--d83fce45-ef58-4c6c-a3ff-1fbc32e98c6e']['rank'] == 5
|
|
|
|
|
assert indicator.extensions['extension-definition--d83fce45-ef58-4c6c-a3ff-1fbc32e98c6e']['toxicity'] == 8
|
|
|
|
|
assert indicator.extensions['extension-definition--d83fce45-ef58-4c6c-a3ff-1fbc32e98c6e']['extension_type'] == 'property-extension'
|
|
|
|
|
assert isinstance(indicator.extensions['extension-definition--d83fce45-ef58-4c6c-a3ff-1fbc32e98c6e'], ExtensionFoo1)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_registered_new_extension_sdo_allow_custom_false():
|
|
|
|
@ -1428,7 +1434,7 @@ def test_registered_new_extension_sdo_allow_custom_false():
|
|
|
|
|
('name', stix2.properties.StringProperty(required=True)),
|
|
|
|
|
('some_property_name1', stix2.properties.StringProperty(required=True)),
|
|
|
|
|
('some_property_name2', stix2.properties.StringProperty()),
|
|
|
|
|
], 'stix-extension--d83fce45-ef58-4c6c-a3f4-1fbc32e9999',
|
|
|
|
|
], 'extension-definition--d83fce45-ef58-4c6c-a3f4-1fbc32e9999',
|
|
|
|
|
)
|
|
|
|
|
class MyFavSDO:
|
|
|
|
|
pass
|
|
|
|
@ -1443,18 +1449,18 @@ def test_registered_new_extension_sdo_allow_custom_false():
|
|
|
|
|
'some_property_name1': 'value1',
|
|
|
|
|
'some_property_name2': 'value2',
|
|
|
|
|
# 'extensions': {
|
|
|
|
|
# 'stix-extension--d83fce45-ef58-4c6c-a3f4-1fbc32e9999': STIXExtensiond83fce45ef584c6ca3f41fbc32e98c6e()
|
|
|
|
|
# 'extension-definition--d83fce45-ef58-4c6c-a3f4-1fbc32e9999': STIXExtensiond83fce45ef584c6ca3f41fbc32e98c6e()
|
|
|
|
|
# }
|
|
|
|
|
}
|
|
|
|
|
sdo_object = stix2.parse(my_favorite_sdo)
|
|
|
|
|
assert isinstance(sdo_object, MyFavSDO)
|
|
|
|
|
assert isinstance(
|
|
|
|
|
sdo_object.extensions['stix-extension--d83fce45-ef58-4c6c-a3f4-1fbc32e9999'],
|
|
|
|
|
stix2.v21.EXT_MAP['stix-extension--d83fce45-ef58-4c6c-a3f4-1fbc32e9999'],
|
|
|
|
|
sdo_object.extensions['extension-definition--d83fce45-ef58-4c6c-a3f4-1fbc32e9999'],
|
|
|
|
|
stix2.v21.EXT_MAP['extension-definition--d83fce45-ef58-4c6c-a3f4-1fbc32e9999'],
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
sdo_serialized = sdo_object.serialize()
|
|
|
|
|
assert '"extensions": {"stix-extension--d83fce45-ef58-4c6c-a3f4-1fbc32e9999": {"is_new_object": true}}' in sdo_serialized
|
|
|
|
|
assert '"extensions": {"extension-definition--d83fce45-ef58-4c6c-a3f4-1fbc32e9999": {"extension_type": "new-sdo"}}' in sdo_serialized
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_registered_new_extension_sco_allow_custom_false():
|
|
|
|
@ -1462,7 +1468,7 @@ def test_registered_new_extension_sco_allow_custom_false():
|
|
|
|
|
'my-favorite-sco', [
|
|
|
|
|
('name', stix2.properties.StringProperty(required=True)),
|
|
|
|
|
('some_network_protocol_field', stix2.properties.StringProperty(required=True)),
|
|
|
|
|
], ['name', 'some_network_protocol_field'], 'stix-extension--a932fcc6-e032-177c-126f-cb970a5a1fff',
|
|
|
|
|
], ['name', 'some_network_protocol_field'], 'extension-definition--a932fcc6-e032-177c-126f-cb970a5a1fff',
|
|
|
|
|
)
|
|
|
|
|
class MyFavSCO:
|
|
|
|
|
pass
|
|
|
|
@ -1474,7 +1480,7 @@ def test_registered_new_extension_sco_allow_custom_false():
|
|
|
|
|
'name': 'This is the name of my favorite SCO',
|
|
|
|
|
'some_network_protocol_field': 'value',
|
|
|
|
|
# 'extensions': {
|
|
|
|
|
# 'stix-extension--a932fcc6-e032-177c-126f-cb970a5a1fff': {
|
|
|
|
|
# 'extension-definition--a932fcc6-e032-177c-126f-cb970a5a1fff': {
|
|
|
|
|
# 'is_extension_so': true
|
|
|
|
|
# }
|
|
|
|
|
# }
|
|
|
|
@ -1483,20 +1489,19 @@ def test_registered_new_extension_sco_allow_custom_false():
|
|
|
|
|
sco_object = stix2.parse(my_favorite_sco)
|
|
|
|
|
assert isinstance(sco_object, MyFavSCO)
|
|
|
|
|
assert isinstance(
|
|
|
|
|
sco_object.extensions['stix-extension--a932fcc6-e032-177c-126f-cb970a5a1fff'],
|
|
|
|
|
stix2.v21.EXT_MAP['stix-extension--a932fcc6-e032-177c-126f-cb970a5a1fff'],
|
|
|
|
|
sco_object.extensions['extension-definition--a932fcc6-e032-177c-126f-cb970a5a1fff'],
|
|
|
|
|
stix2.v21.EXT_MAP['extension-definition--a932fcc6-e032-177c-126f-cb970a5a1fff'],
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
sco_serialized = sco_object.serialize()
|
|
|
|
|
assert '"extensions": {"stix-extension--a932fcc6-e032-177c-126f-cb970a5a1fff": {"is_extension_so": true}}' in sco_serialized
|
|
|
|
|
assert '"extensions": {"extension-definition--a932fcc6-e032-177c-126f-cb970a5a1fff": {"extension_type": "new-sco"}}' in sco_serialized
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_registered_new_extension_marking_allow_custom_false():
|
|
|
|
|
@stix2.v21.CustomMarking(
|
|
|
|
|
'my-favorite-marking', [
|
|
|
|
|
('name', stix2.properties.StringProperty(required=True)),
|
|
|
|
|
('some_marking_field', stix2.properties.StringProperty(required=True)),
|
|
|
|
|
], 'stix-extension--a932fcc6-e032-176c-126f-cb970a5a1fff',
|
|
|
|
|
], 'extension-definition--a932fcc6-e032-176c-126f-cb970a5a1fff',
|
|
|
|
|
)
|
|
|
|
|
class MyFavMarking:
|
|
|
|
|
pass
|
|
|
|
@ -1506,10 +1511,10 @@ def test_registered_new_extension_marking_allow_custom_false():
|
|
|
|
|
'spec_version': '2.1',
|
|
|
|
|
'id': 'marking-definition--f9dbe89c-0030-4a9d-8b78-0dcd0a0de874',
|
|
|
|
|
'name': 'This is the name of my favorite Marking',
|
|
|
|
|
'some_marking_field': 'value',
|
|
|
|
|
'extensions': {
|
|
|
|
|
'stix-extension--a932fcc6-e032-176c-126f-cb970a5a1fff': {
|
|
|
|
|
'extends_stix_object_definition': True,
|
|
|
|
|
'extension-definition--a932fcc6-e032-176c-126f-cb970a5a1fff': {
|
|
|
|
|
'extension_type': 'property-extension',
|
|
|
|
|
'some_marking_field': 'value',
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
@ -1517,9 +1522,10 @@ def test_registered_new_extension_marking_allow_custom_false():
|
|
|
|
|
marking_object = stix2.parse(my_favorite_marking)
|
|
|
|
|
assert isinstance(marking_object, stix2.v21.MarkingDefinition)
|
|
|
|
|
assert isinstance(
|
|
|
|
|
marking_object.extensions['stix-extension--a932fcc6-e032-176c-126f-cb970a5a1fff'],
|
|
|
|
|
stix2.v21.EXT_MAP['stix-extension--a932fcc6-e032-176c-126f-cb970a5a1fff'],
|
|
|
|
|
marking_object.extensions['extension-definition--a932fcc6-e032-176c-126f-cb970a5a1fff'],
|
|
|
|
|
stix2.v21.EXT_MAP['extension-definition--a932fcc6-e032-176c-126f-cb970a5a1fff'],
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
marking_serialized = marking_object.serialize()
|
|
|
|
|
assert '"extensions": {"stix-extension--a932fcc6-e032-176c-126f-cb970a5a1fff": {"extends_stix_object_definition": true}}' in marking_serialized
|
|
|
|
|
marking_serialized = marking_object.serialize(sort_keys=True)
|
|
|
|
|
assert '"extensions": {"extension-definition--a932fcc6-e032-176c-126f-cb970a5a1fff": ' \
|
|
|
|
|
'{"extension_type": "property-extension", "some_marking_field": "value"}}' in marking_serialized
|
|
|
|
|