Skip to content

Fix properties types #575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SYNchroACK wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix properties types #575

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ddfdd59
Rename AlternateDataStream based on the naming pattern and add missin…
SYNchroACK Oct 18, 2023
5f71326
Add missing _type to _WindowsPEOptionalHeaderType
SYNchroACK Oct 18, 2023
0aed7ef
Rename WindowsPESection based on the naming pattern and add missing _…
SYNchroACK Oct 18, 2023
7fbe4cd
Rename EmailMIMEComponent based on the naming pattern and add missing…
SYNchroACK Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions stix2/v21/observables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,12 @@ class EmailAddress(_Observable):
_id_contributing_properties = ["value"]


class EmailMIMEComponent(_STIXBase21):
class EmailMIMEComponentType(_STIXBase21):
"""For more detailed information on this object's properties, see
`the STIX 2.1 specification <https://docs.oasis-open.org/cti/stix/v2.1/os/stix-v2.1-os.html#_qpo5x7d8mefq>`__.
"""

_type = 'email-mime-component-type'
_properties = OrderedDict([
('body', StringProperty()),
('body_raw_ref', ReferenceProperty(valid_types=['artifact', 'file'], spec_version='2.1')),
Expand All @@ -156,7 +157,7 @@ class EmailMIMEComponent(_STIXBase21):
])

def _check_object_constraints(self):
super(EmailMIMEComponent, self)._check_object_constraints()
super(EmailMIMEComponentType, self)._check_object_constraints()
self._check_at_least_one_property(['body', 'body_raw_ref'])


Expand All @@ -183,7 +184,7 @@ class EmailMessage(_Observable):
('received_lines', ListProperty(StringProperty)),
('additional_header_fields', DictionaryProperty(spec_version='2.1')),
('body', StringProperty()),
('body_multipart', ListProperty(EmbeddedObjectProperty(type=EmailMIMEComponent))),
('body_multipart', ListProperty(EmbeddedObjectProperty(type=EmailMIMEComponentType))),
('raw_email_ref', ReferenceProperty(valid_types='artifact', spec_version='2.1')),
('object_marking_refs', ListProperty(ReferenceProperty(valid_types='marking-definition', spec_version='2.1'))),
('granular_markings', ListProperty(GranularMarking)),
Expand Down Expand Up @@ -212,11 +213,12 @@ class ArchiveExt(_Extension):
])


class AlternateDataStream(_STIXBase21):
class AlternateDataStreamType(_STIXBase21):
"""For more detailed information on this object's properties, see
`the STIX 2.1 specification <https://docs.oasis-open.org/cti/stix/v2.1/os/stix-v2.1-os.html#_8i2ts0xicqea>`__.
"""

_type = 'alternate-data-stream-type'
_properties = OrderedDict([
('name', StringProperty(required=True)),
('hashes', HashesProperty(HASHING_ALGORITHM, spec_version="2.1")),
Expand All @@ -232,7 +234,7 @@ class NTFSExt(_Extension):
_type = 'ntfs-ext'
_properties = OrderedDict([
('sid', StringProperty()),
('alternate_data_streams', ListProperty(EmbeddedObjectProperty(type=AlternateDataStream))),
('alternate_data_streams', ListProperty(EmbeddedObjectProperty(type=AlternateDataStreamType))),
])


Expand Down Expand Up @@ -270,6 +272,7 @@ class WindowsPEOptionalHeaderType(_STIXBase21):
`the STIX 2.1 specification <https://docs.oasis-open.org/cti/stix/v2.1/os/stix-v2.1-os.html#_29l09w731pzc>`__.
"""

_type = 'windows-pe-optional-header-type'
_properties = OrderedDict([
('magic_hex', HexProperty()),
('major_linker_version', IntegerProperty()),
Expand Down Expand Up @@ -309,11 +312,12 @@ def _check_object_constraints(self):
self._check_at_least_one_property()


class WindowsPESection(_STIXBase21):
class WindowsPESectionType(_STIXBase21):
"""For more detailed information on this object's properties, see
`the STIX 2.1 specification <https://docs.oasis-open.org/cti/stix/v2.1/os/stix-v2.1-os.html#_ioapwyd8oimw>`__.
"""

_type = 'windows-pe-section-type'
_properties = OrderedDict([
('name', StringProperty(required=True)),
('size', IntegerProperty(min=0)),
Expand All @@ -340,7 +344,7 @@ class WindowsPEBinaryExt(_Extension):
('characteristics_hex', HexProperty()),
('file_header_hashes', HashesProperty(HASHING_ALGORITHM, spec_version="2.1")),
('optional_header', EmbeddedObjectProperty(type=WindowsPEOptionalHeaderType)),
('sections', ListProperty(EmbeddedObjectProperty(type=WindowsPESection))),
('sections', ListProperty(EmbeddedObjectProperty(type=WindowsPESectionType))),
])


Expand Down