Michael Chisholm
93d2524d45
Remove excessive nested lists from CusomObservable decorator.
...
Remove iterable chaining from CustomObject decorator. If all
values are guaranteed lists now, it no longer makes sense to use
it. Simpler and clearer to use plain old list concatenation.
2021-07-02 21:10:52 -04:00
Michael Chisholm
b9eba77008
Move the CustomExtension decorator from the v21.observables module
...
to v21.common. Custom extensions are not specific to SCOs, so I
don't know why it was in that module. Now, ExtensionDefinition
and CustomExtension are together in the same module, just like
MarkingDefinition and CustomMarking are together. Made sense to
me.
2021-07-02 20:54:54 -04:00
Michael Chisholm
d87718c15c
Bug fixes, hackage removal, and some pre-commit stylistic
...
fixes.
- Fixed bugged logic in _STIXBase._check_at_least_one_property(),
and revamped the code to be simpler and clearer.
- Changed custom extension registration to auto-create an
"extension_type" property based on the attribute of that
name on the custom class, if present.
- The custom extension registration change above uncovered
what seemed like a bug in a unit test: a custom extension
was registered, but it was not given an extension type. The
test used the extension as extension_type="property-extension";
this now causes a standard error about an extra property. I
fixed the test to assign the custom extension the proper type.
2021-06-30 17:50:00 -04:00
Chris Lenk
2528077eb0
Merge branch 'master' into dev-extensions-proposal
2021-06-13 01:48:33 -04:00
Michael Chisholm
c8c4e89415
Add back usage of spec_version where HashesProperty is used for
...
various STIX objects. Also pre-commit stylistic fixes...
2021-03-31 16:20:33 -04:00
Michael Chisholm
c590de8ea5
Add proper customization enforcement for open vocabs. This adds
...
a new OpenVocabProperty class. It also requires a redesign of
HashesProperty and redoes general library support for hash
algorithms.
2021-03-31 16:20:28 -04:00
Emmanuelle Vargas-Gonzalez
bde9aaa13e
update some TODOs and clear out some backwards kept imports (breaking)
2021-03-30 22:40:41 -04:00
Emmanuelle Vargas-Gonzalez
d5e6226c82
update hyperlinks to STIX 2.1 CS 02
2021-02-19 23:27:41 -05:00
Emmanuelle Vargas-Gonzalez
77d20c787a
Update observables.py
...
Add missing common properties in decorator closes #484
2021-01-27 11:31:14 -05:00
Emmanuelle Vargas-Gonzalez
a62dfbb41b
missing common properties on CustomObservable decorator
2021-01-26 22:17:03 -05:00
Emmanuelle Vargas-Gonzalez
82390ba648
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into dev-extensions-proposal
2021-01-15 13:01:30 -05:00
Emmanuelle Vargas-Gonzalez
85c14d1502
all changes from add-trailing-commas v2.0.2
2021-01-13 17:52:15 -05:00
Emmanuelle Vargas-Gonzalez
6a6f13c37b
rename the Class auto-naming from 'STIXExtension' to 'ExtensionDefinition'
2020-12-23 16:07:30 -05:00
Emmanuelle Vargas-Gonzalez
a3fce3686a
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into dev-extensions-proposal
2020-12-23 15:08:10 -05:00
Emmanuelle Vargas-Gonzalez
4127ea9afd
modify main codebase based on 7.3 Extension changes
2020-12-22 21:41:46 -05:00
Emmanuelle Vargas-Gonzalez
119364c889
Merge branch 'master' into 472-issue
2020-11-20 10:02:46 -05:00
Emmanuelle Vargas-Gonzalez
e7242c9ae6
forgot one...
2020-11-19 08:48:57 -05:00
Emmanuelle Vargas-Gonzalez
49985cc51d
fix ordering problem with Class definitions
2020-11-18 19:01:12 -05:00
Emmanuelle Vargas-Gonzalez
c9bafaf5ae
fix typo for Class X509V3ExtensionsType
2020-11-18 18:08:57 -05:00
Emmanuelle Vargas-Gonzalez
aa77f2b174
add test cases
...
additional file changes based on test cases
2020-11-10 21:09:17 -05:00
Emmanuelle Vargas-Gonzalez
e4165f96aa
major changes to support the extension mechanism
...
moved some version specific logic into their area, changes to decorators to support Object Registration with Extension
2020-11-10 18:32:58 -05:00
Emmanuelle Vargas-Gonzalez
4340be13c4
changes to the ExtensionsProperty
2020-11-09 20:58:34 -05:00
Emmanuelle Vargas-Gonzalez
5cb52844dc
fixing typos on Object types
2020-11-05 12:56:30 -05:00
Emmanuelle Vargas-Gonzalez
97dfe092f9
re-order properties
2020-10-19 19:23:30 -04:00
Michael Chisholm
d888eb60e2
Remove protocol_family and its uses from the v21 network
...
socket SCO extension. It's a 2.0 property that got copied into
the 2.1 code by mistake.
2020-07-08 14:26:02 -04:00
Chris Lenk
8e785cbd05
Remove outdated comment
2020-07-06 16:42:33 -04:00
Michael Chisholm
99bf4215a3
Change all uses of ObjectReferenceProperty in 2.1 SCO classes
...
to ReferenceProperty. Add a unit test to ensure that when a
stix2 object is passed as a value of a ReferenceProperty, that
the ID is properly pulled out and used as the actual property
value, and that it doesn't affect the deterministic ID
calculation.
2020-06-08 17:24:33 -04:00
Chris Lenk
03cb225932
Merge branch 'master' into 365-versioned-classes
2020-04-02 06:02:20 -04:00
Chris Lenk
c494a2e477
Use TypeProperty.clean() to verify type format
2020-04-01 21:52:04 -04:00
Rich Piazza
46219bf072
add 2.1 links
2020-03-27 09:36:10 -04:00
Chris Lenk
e8035863b8
Make swid an id-contributing property
2020-03-21 23:56:09 -04:00
Chris Lenk
e31634c32b
Rework spec version detection for _STIXBase objs
2020-03-21 22:22:36 -04:00
Chris Lenk
3dda25e976
Merge pull request #362 from chisholm/file_id_contrib_props
...
Add parent_directory_ref as an ID contributing property for file SCOs
2020-03-12 09:36:16 -04:00
Chris Lenk
87c5ef30ad
Merge pull request #358 from chisholm/software_cpe_swid
...
Add swid property to the software SCO
2020-03-11 23:03:18 -04:00
Michael Chisholm
a862b930be
Add parent_directory_ref as an ID contributing property for the
...
file SCO.
2020-03-05 17:18:32 -05:00
Desai, Kartikey H
a5cd0fdc50
Change location of None-check for id_contrib_props. Fixes #351
2020-03-04 14:46:55 -05:00
Desai, Kartikey H
fc95b400ff
Change default parameters from empty lists to None. Fixes #351
2020-03-04 14:29:35 -05:00
Michael Chisholm
4e2b018272
Add a property to the software SCO, due to STIX spec change.
2020-03-02 16:57:18 -05:00
Desai, Kartikey H
41e541959d
Add _id_contributing_properties functionality to custom SCOs. Tests coming soon. Fixes #351
2020-02-24 21:11:42 -05:00
Desai, Kartikey H
8219b34ea4
Fix formatting issues. Fixes #336
2020-02-19 09:24:27 -05:00
Desai, Kartikey H
86f9e51a42
Fixes #336
2020-02-19 09:11:30 -05:00
Michael Chisholm
176cb980a2
Remove workaround for "values" being both a Mapping method name
...
and sometimes a STIX property name. It didn't work (caused
crashes under some circumstances). Now, attributes whose names
conflict with Mapping methods will have the Mapping
interpretation. Same-named STIX object properties will not be
accessible as attributes.
2020-01-28 18:13:36 -05:00
Desai, Kartikey H
e260dbb716
Fixes #309
2019-12-23 17:30:34 -05:00
Desai, Kartikey H
32d2a0a4fd
Fixes #309
2019-12-23 17:30:34 -05:00
Desai, Kartikey H
3a46d42aaa
parse() handles observables in 2.1. Change mechanism for (in)valid_types in ReferenceProperty. Fix _custom_observable_builder to include ReferenceProperty instead of ObjectReferenceProperty, and added ID property to custom observables
2019-12-06 09:35:36 -05:00
Desai, Kartikey H
aee296ea46
Fixes #296
2019-12-06 09:35:36 -05:00
Zach Rush
806c6c52d9
Added tests for other changes, and moved attribute defaults to an init function
2019-11-25 15:52:50 -05:00
Zach Rush
46f1778d04
Fixed all issues brought up in issue #305 by Chris Lenk
2019-11-22 13:24:09 -05:00
Desai, Kartikey H
f241ed5c6c
Remove at_least_one=False from Artifact SCO
2019-09-18 10:56:42 -04:00
Desai, Kartikey H
8447c9fcd9
Add few tests to improve some code coverage
2019-09-11 14:21:41 -04:00