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

Marking-definitions are now checked for their attribute before being tested and tests were modified to expect the correct value

master
Zach Rush 2019-09-13 10:51:28 -04:00
parent afa4af65c6
commit 5f3e41a9ab
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
stix2/v20/common.py
View File

@ -3,6 +3,8 @@
from collections import OrderedDict from collections import OrderedDict
import copy import copy
import six
from ..base import _STIXBase from ..base import _STIXBase
from ..custom import _custom_marking_builder from ..custom import _custom_marking_builder
from ..markings import _MarkingsMixin from ..markings import _MarkingsMixin
@ -15,9 +17,11 @@ from ..utils import NOW, _get_dict
def _should_set_millisecond(cr, marking_type): def _should_set_millisecond(cr, marking_type):
# TLP instances in the 2.0 spec have millisecond precision unlike other markings
if marking_type == TLPMarking: if marking_type == TLPMarking:
return True return True
if type(cr) == str: # otherwise, precision is kept from how it was given
if isinstance(cr, six.text_type):
if '.' in cr: if '.' in cr:
return True return True
else: else:
@ -135,11 +139,14 @@ class MarkingDefinition(_STIXBase, _MarkingsMixin):
except KeyError: except KeyError:
raise ValueError("definition_type must be a valid marking type") raise ValueError("definition_type must be a valid marking type")
try:
if _should_set_millisecond(kwargs['created'], marking_type): if _should_set_millisecond(kwargs['created'], marking_type):
self._properties = copy.deepcopy(self._properties) self._properties = copy.deepcopy(self._properties)
self._properties.update([ self._properties.update([
('created', TimestampProperty(default=lambda: NOW, precision='millisecond')), ('created', TimestampProperty(default=lambda: NOW, precision='millisecond')),
]) ])
except KeyError:
pass
if not isinstance(kwargs['definition'], marking_type): if not isinstance(kwargs['definition'], marking_type):
defn = _get_dict(kwargs['definition']) defn = _get_dict(kwargs['definition'])