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

Merge pull request #290 from khdesai/wd05SCO 

Remove at_least_one=False from Artifact SCO
master
Chris Lenk 2019-09-19 10:43:36 -04:00 committed by GitHub
parent e1a88a4840 113d481e84
commit c3b2121f41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stix2/base.py
View File

@ -23,6 +23,7 @@ from .utils import revoke as _revoke
__all__ = ['STIXJSONEncoder', '_STIXBase'] __all__ = ['STIXJSONEncoder', '_STIXBase']
DEFAULT_ERROR = "{type} must have {property}='{expected}'." DEFAULT_ERROR = "{type} must have {property}='{expected}'."
SCO_DET_ID_NAMESPACE = uuid.UUID("00abedb4-aa42-466c-9c01-fed23315a9b7")
class STIXJSONEncoder(json.JSONEncoder): class STIXJSONEncoder(json.JSONEncoder):
@ -368,7 +369,6 @@ class _Observable(_STIXBase):
def _generate_id(self, kwargs): def _generate_id(self, kwargs):
required_prefix = self._type + "--" required_prefix = self._type + "--"
namespace = uuid.UUID("00abedb4-aa42-466c-9c01-fed23315a9b7")
properties_to_use = self._id_contributing_properties properties_to_use = self._id_contributing_properties
if properties_to_use: if properties_to_use:
@ -396,9 +396,9 @@ class _Observable(_STIXBase):
# try/except here to enable python 2 compatibility # try/except here to enable python 2 compatibility
try: try:
return required_prefix + six.text_type(uuid.uuid5(namespace, data)) return required_prefix + six.text_type(uuid.uuid5(SCO_DET_ID_NAMESPACE, data))
except UnicodeDecodeError: except UnicodeDecodeError:
return required_prefix + six.text_type(uuid.uuid5(namespace, six.binary_type(data))) return required_prefix + six.text_type(uuid.uuid5(SCO_DET_ID_NAMESPACE, six.binary_type(data)))
# We return None if there are no values specified for any of the id-contributing-properties # We return None if there are no values specified for any of the id-contributing-properties
return None return None

2
stix2/v21/observables.py
View File

@ -50,7 +50,7 @@ class Artifact(_Observable):
def _check_object_constraints(self): def _check_object_constraints(self):
super(Artifact, self)._check_object_constraints() super(Artifact, self)._check_object_constraints()
self._check_mutually_exclusive_properties(['payload_bin', 'url'], at_least_one=False) self._check_mutually_exclusive_properties(['payload_bin', 'url'])
self._check_properties_dependency(['hashes'], ['url']) self._check_properties_dependency(['hashes'], ['url'])