diff --git a/stix2/base.py b/stix2/base.py index 31cf657..3ff8e72 100644 --- a/stix2/base.py +++ b/stix2/base.py @@ -77,7 +77,7 @@ class _STIXBase(collections.Mapping): if failed_dependency_pairs: raise DependentPropertiestError(self.__class__, failed_dependency_pairs) - def _check_object_constaints(self): + def _check_object_constraints(self): if self.granular_markings: for m in self.granular_markings: # TODO: check selectors @@ -111,7 +111,7 @@ class _STIXBase(collections.Mapping): self._inner = setting_kwargs - self._check_object_constaints() + self._check_object_constraints() def __getitem__(self, key): return self._inner[key] diff --git a/stix2/observables.py b/stix2/observables.py index 3047556..1c60db5 100644 --- a/stix2/observables.py +++ b/stix2/observables.py @@ -25,8 +25,8 @@ class Artifact(_Observable): 'hashes': HashesProperty(), } - def _check_object_constaints(self): - super(Artifact, self)._check_object_constaints() + def _check_object_constraints(self): + super(Artifact, self)._check_object_constraints() self._check_mutually_exclusive_properties(["payload_bin", "url"]) self._check_properties_dependency(["hashes"], ["url"]) @@ -82,8 +82,8 @@ class EmailMIMEComponent(_STIXBase): 'content_disposition': StringProperty(), } - def _check_object_constaints(self): - super(EmailMIMEComponent, self)._check_object_constaints() + def _check_object_constraints(self): + super(EmailMIMEComponent, self)._check_object_constraints() self._check_at_least_one_property(["body", "body_raw_ref"]) @@ -107,8 +107,8 @@ class EmailMessage(_Observable): 'raw_email_ref': ObjectReferenceProperty(), } - def _check_object_constaints(self): - super(EmailMessage, self)._check_object_constaints() + def _check_object_constraints(self): + super(EmailMessage, self)._check_object_constraints() self._check_properties_dependency(["is_multipart"], ["body_multipart"]) # self._dependency(["is_multipart"], ["body"], [False]) @@ -135,8 +135,8 @@ class NTFSExt(_STIXBase): 'alternate_data_streams': ListProperty(EmbeddedObjectProperty(type=AlternateDataStream)), } - def _check_object_constaints(self): - super(NTFSExt, self)._check_object_constaints() + def _check_object_constraints(self): + super(NTFSExt, self)._check_object_constraints() self._check_at_least_one_property() @@ -149,8 +149,8 @@ class PDFExt(_STIXBase): 'pdfid1': StringProperty(), } - def _check_object_constaints(self): - super(PDFExt, self)._check_object_constaints() + def _check_object_constraints(self): + super(PDFExt, self)._check_object_constraints() self._check_at_least_one_property() @@ -163,8 +163,8 @@ class RasterImageExt(_STIXBase): 'exif_tags': DictionaryProperty(), } - def _check_object_constaints(self): - super(RasterImageExt, self)._check_object_constaints() + def _check_object_constraints(self): + super(RasterImageExt, self)._check_object_constraints() self._check_at_least_one_property() @@ -203,8 +203,8 @@ class WindowsPEOptionalHeaderType(_STIXBase): 'hashes': HashesProperty(), } - def _check_object_constaints(self): - super(WindowsPEOptionalHeaderType, self)._check_object_constaints() + def _check_object_constraints(self): + super(WindowsPEOptionalHeaderType, self)._check_object_constraints() self._check_at_least_one_property() @@ -257,8 +257,8 @@ class File(_Observable): 'content_ref': ObjectReferenceProperty(), } - def _check_object_constaints(self): - super(File, self)._check_object_constaints() + def _check_object_constraints(self): + super(File, self)._check_object_constraints() self._check_properties_dependency(["is_encrypted"], ["encryption_algorithm", "decryption_key"]) self._check_at_least_one_property(["hashes", "name"]) @@ -356,8 +356,8 @@ class TCPExt(_STIXBase): 'dst_flags_hex': HexProperty(), } - def _check_object_constaints(self): - super(TCPExt, self)._check_object_constaints() + def _check_object_constraints(self): + super(TCPExt, self)._check_object_constraints() self._check_at_least_one_property() @@ -385,8 +385,8 @@ class NetworkTraffic(_Observable): 'encapsulates_by_ref': ObjectReferenceProperty(), } - def _check_object_constaints(self): - super(NetworkTraffic, self)._check_object_constaints() + def _check_object_constraints(self): + super(NetworkTraffic, self)._check_object_constraints() self._check_at_least_one_property(["src_ref", "dst_ref"]) @@ -454,8 +454,9 @@ class Process(_Observable): 'child_refs': ListProperty(ObjectReferenceProperty), } - def _check_object_constaints(self): - super(Process, self)._check_object_constaints() + def _check_object_constraints(self): + # no need to check windows-service-ext, since it has a required property + super(Process, self)._check_object_constraints() try: self._check_at_least_one_property() if self.extensions and "windows-process-ext" in self.extensions: diff --git a/stix2/other.py b/stix2/other.py index 9ae3128..51663b3 100644 --- a/stix2/other.py +++ b/stix2/other.py @@ -15,8 +15,8 @@ class ExternalReference(_STIXBase): 'external_id': StringProperty(), } - def _check_object_constaints(self): - super(ExternalReference, self)._check_object_constaints() + def _check_object_constraints(self): + super(ExternalReference, self)._check_object_constraints() self._check_at_least_one_property(["description", "external_id", "url"])