Desai, Kartikey H
dee2f1f60c
Merge branch 'stix2.1' of https://github.com/oasis-open/cti-python-stix2 into wd05SCO
2019-08-12 08:16:00 -04:00
Michael Chisholm
5e5a03c001
Changed emitted deprecation warnings to a custom DeprecationWarning
...
subclass. Changed the unit test to test for that specific
warning category, instead of any DeprecationWarning.
2019-08-07 10:16:18 -04:00
Michael Chisholm
27beec4060
Add a deprecation warning for the "objects" property of
...
observed-data. Add a unit test to ensure we get the warning.
2019-07-29 16:35:38 -04:00
Michael Chisholm
8362d80206
Change "object_modified" property of LocationContent to be
...
optional. Add a corresponding unit test.
2019-07-25 16:56:34 -04:00
Michael Chisholm
5589480980
Improved the exception class hierarchy:
...
- Removed all plain python base classes (e.g. ValueError, TypeError)
- Renamed InvalidPropertyConfigurationError -> PropertyPresenceError,
since incorrect values could be considered a property config error, and
I really just wanted this class to apply to presence (co-)constraint
violations.
- Added ObjectConfigurationError as a superclass of InvalidValueError,
PropertyPresenceError, and any other exception that could be raised
during _STIXBase object init, which is when the spec compliance
checks happen. This class is intended to represent general spec
violations.
- Did some class reordering in exceptions.py, so all the
ObjectConfigurationError subclasses were together.
Changed how property "cleaning" errors were handled:
- Previous docs said they should all be ValueErrors, but that would require
extra exception check-and-replace complexity in the property
implementations, so that requirement is removed. Doc is changed to just
say that cleaning problems should cause exceptions to be raised.
_STIXBase._check_property() now handles most exception types, not just
ValueError.
- Decided to try chaining the original clean error to the InvalidValueError,
in case the extra diagnostics would be helpful in the future. This is
done via 'six' adapter function and only works on python3.
- A small amount of testing was removed, since it was looking at custom
exception properties which became unavailable once the exception was
replaced with InvalidValueError.
Did another pass through unit tests to fix breakage caused by the changed
exception class hierarchy.
Removed unnecessary observable extension handling code from
parse_observable(), since it was all duplicated in ExtensionsProperty.
The redundant code in parse_observable() had different exception behavior
than ExtensionsProperty, which makes the API inconsistent and unit tests
more complicated. (Problems in ExtensionsProperty get replaced with
InvalidValueError, but extensions problems handled directly in
parse_observable() don't get the same replacement, and so the exception
type is different.)
Redid the workbench monkeypatching. The old way was impossible to make
work, and had caused ugly ripple effect hackage in other parts of the
codebase. Now, it replaces the global object maps with factory functions
which behave the same way when called, as real classes. Had to fix up a
few unit tests to get them all passing with this monkeypatching in place.
Also remove all the xfail markings in the workbench test suite, since all
tests now pass.
Since workbench monkeypatching isn't currently affecting any unit tests,
tox.ini was simplified to remove the special-casing for running the
workbench tests.
Removed the v20 workbench test suite, since the workbench currently only
works with the latest stix object version.
2019-07-19 14:50:11 -04:00
Desai, Kartikey H
4660d5ea28
Update SCO specs per WD 05 specs
2019-07-17 15:48:09 -04:00
Michael Chisholm
1b7abaf228
WIP: updating objects to be compliant with stix2.1 WD05. This
...
includes SDO/SRO class updates, but no unit test updates. The
class updates broke unit tests, so that still needs to be
addressed.
2019-07-14 15:34:31 -04:00
Desai, Kartikey H
ae35d2ab01
Add and update tests to conform code to WD04 SDO specs
2019-07-02 13:17:43 -04:00
Desai, Kartikey H
c98fcafb1a
Update tests to address conformance to WD04 specs
2019-07-01 15:26:30 -04:00
Desai, Kartikey H
ef408e1971
preliminary changes to make stix2 code conform to WD 04 specs
2019-07-01 11:52:55 -04:00
Chris Lenk
953a91ba8e
Merge pull request #273 from chisholm/update_course_of_action
...
Update course of action for stix2.1 (again)
2019-06-28 12:32:14 -04:00
Chris Lenk
266516ebbc
Merge pull request #272 from chisholm/malware_analysis
...
Add stix2.1 malware-analysis SDO
2019-06-28 09:57:47 -04:00
chrisr3d
6aff018695
fix: Avoid issues with custom objects
...
- Custom objects type is dict, which makes it fail
when the attribute 'id' is called
2019-06-27 17:19:05 +02:00
Michael Chisholm
de93a2ee32
Fix stix2.1 course-of-action SDO class properties action_reference
...
and action_bin to have the correct types.
2019-06-26 19:54:28 -04:00
Michael Chisholm
5c92db9861
Add stix2.1 malware-analysis SDO
2019-06-26 17:06:26 -04:00
Chris Lenk
b8c5bec101
Merge branch 'master' into stix2.1
2019-06-26 12:22:40 -04:00
Chris Lenk
28ac284b84
Remove unnecessary ObservedData constraint
...
first_observed and last_observed are both required, so this co-constraint was removed from WD04.
2019-06-26 11:18:47 -04:00
Michael Chisholm
58ff89f112
Update observed-data SDO class, adding the new stix2.1 property
...
"object_refs". Added a couple tests for it.
2019-06-21 15:44:04 -04:00
Michael Chisholm
a150b0f4aa
Change all uses of IDProperty and ReferenceProperty to specify
...
a particular spec_version.
2019-06-14 17:58:51 -04:00
Michael Chisholm
4f593e6d16
Changes from the add-trailing-comma pre-commit hook
2019-06-12 14:49:34 -04:00
Michael Chisholm
caa1d45ae2
Update stix2.1 course-of-action support to the latest spec.
2019-06-11 18:10:02 -04:00
Chris Lenk
a6fa3ff1d7
Slightly change bundle error message
2019-05-22 11:05:01 -04:00
Desai, Kartikey H
86790a736f
Fixes #257
2019-05-20 15:29:01 -05:00
Desai, Kartikey H
45d3020518
Fixes #257
2019-05-17 14:21:35 -05:00
Desai, Kartikey H
a61344a8aa
Add get_obj function to bundle.py to make accessing bundles easier
2019-05-14 13:48:54 -04:00
Emmanuelle Vargas-Gonzalez
d5f0c46dd5
re-organize imports in v20, v21
2019-05-08 10:35:53 -04:00
Emmanuelle Vargas-Gonzalez
46c47a0d08
new approach towards validation of tlp instances
2019-05-03 09:59:07 -04:00
Chris Lenk
afe57f642d
Add docstring for to_maps_url()
2019-02-08 14:41:54 -05:00
Desai, Kartikey H
edfe0ba51a
Add support for Bing Maps and corresponding tests. Fixes #86
2019-02-08 09:37:27 -05:00
Desai, Kartikey H
8be704a5b9
Update to_map_url and add tests. Fixes #86
2019-02-07 10:31:51 -05:00
Desai, Kartikey H
dc91c9cbf4
Initial fix for issue 86. Fixes #86
2019-02-06 16:16:50 -05:00
Emmanuelle Vargas-Gonzalez
db5f8f2ebf
Update docstrings to relocate links\documentation
2019-01-11 13:55:05 -05:00
Chris Lenk
1ad64dfc0c
Move CallableValues to prevent duplicate code
2019-01-09 10:46:48 -05:00
Chris Lenk
34002c4f7c
Fix error when printing WindowsRegistryKey
...
Caused by WindowsRegistryKey having a 'values' property. Fixes #236 .
2018-12-21 14:33:59 -05:00
Emmanuelle Vargas-Gonzalez
6f897bc91d
small enhancements, fix property for TLPMarking
2018-11-29 10:26:20 -05:00
Emmanuelle Vargas-Gonzalez
71a2aa2611
update project documentation.
2018-11-28 16:51:00 -05:00
Emmanuelle Vargas-Gonzalez
5e5d10e7aa
Finish alignment of 2.1 components
2018-11-01 08:17:34 -04:00
Emmanuelle Vargas-Gonzalez
d614343910
Rename tests with duplicate name.
2018-10-17 07:56:10 -04:00
Emmanuelle Vargas-Gonzalez
dec75082df
Add new constrains parameters to IntegerProperty and FloatProperty
...
New constraints on timestamps, integer and floats for many objects
2018-10-15 15:02:59 -04:00
Emmanuelle Vargas-Gonzalez
ad76e7155c
MALWARE RESTORE POINT - Reverted changes to Malware based on STIX 2.1 CSD01
...
Use this commit to restore Malware changes.
2018-07-25 13:34:56 -04:00
Emmanuelle Vargas-Gonzalez
303159a818
pre-commit hooks changes
2018-07-25 13:32:22 -04:00
Emmanuelle Vargas-Gonzalez
21c84acc8f
Add missing properties to Relationship object and update tests
2018-07-25 12:44:46 -04:00
Emmanuelle Vargas-Gonzalez
af2a5605ce
Add constraints to Location object
2018-07-25 12:43:57 -04:00
Emmanuelle Vargas-Gonzalez
51a499cb33
Formatting changes made by the new pre-commit hook 'add trailing commas'
...
closes #189
2018-07-13 11:10:05 -04:00
Emmanuelle Vargas-Gonzalez
bdfc221cb0
Update v21 properties to latest spec changes
2018-07-12 14:31:14 -04:00
Emmanuelle Vargas-Gonzalez
e513c8d638
Hide builder methods in 'custom.py' and update imports accordingly
2018-07-11 08:11:47 -04:00
Emmanuelle Vargas-Gonzalez
8d378fcf81
Remove STIXRelationshipObject from 'sro.py'
2018-07-10 15:27:05 -04:00
Emmanuelle Vargas-Gonzalez
023603d86f
Remove duplicate code from 'sdo.py', removed STIXDomainObject
...
Apply proper 'spec_version' constraints to v21 objects
2018-07-10 15:22:21 -04:00
Emmanuelle Vargas-Gonzalez
54268ae7dd
Remove observables and extension mappings, custom code and apply property constrain in v21
2018-07-10 15:20:16 -04:00
Emmanuelle Vargas-Gonzalez
1177694739
Adding docstrings to 2.1 objects
2018-07-10 15:15:33 -04:00
Emmanuelle Vargas-Gonzalez
b722fdc0ed
Remove duplicate register methods and CustomMarking code
2018-07-10 15:07:08 -04:00
Emmanuelle Vargas-Gonzalez
5332d54383
Refactor Bundle
...
Removed redundant STIXObjectProperty, for 2.1 use validation specific to that version
2018-07-10 15:02:55 -04:00
Emmanuelle Vargas-Gonzalez
78d77254ae
Add object mappings in the top of each version package
2018-07-10 14:59:43 -04:00
Emmanuelle Vargas-Gonzalez
fe64fb044f
Removed per version 'properties.py'
2018-07-10 14:47:30 -04:00
Emmanuelle Vargas-Gonzalez
2e6bb74be8
Add spec version 2.1 to object missing the property.
2018-06-29 18:48:41 -04:00
Emmanuelle Vargas-Gonzalez
7fd379d0b5
Minor style changes.
...
Removed OrderedDict and update()... Also a lot of single quoting except for errors
2018-06-29 18:38:04 -04:00
Emmanuelle Vargas-Gonzalez
9baaad6e08
Sort imports.
2018-06-26 12:23:53 -04:00
Trey Darley
5cbe886cdb
split properties out by spec version
2018-06-26 09:32:24 +00:00
Trey Darley
d44c2abd0f
2.1 spec (somewhat inexplicably) limits dict keys to 250 chars
2018-06-26 09:23:52 +00:00
Trey Darley
cc58a3a4f4
2.1 removes 3 char limit on dict keys
2018-06-26 09:22:57 +00:00
Trey Darley
6b1da856dd
split properties out by spec version
2018-06-26 09:22:04 +00:00
Emmanuelle Vargas-Gonzalez
0ddb7b3807
Update observables.RasterImageExt 'image_weight' property to 'image_width'
2018-06-25 08:55:12 -04:00
Michael Chisholm
486c588306
Fix silly isort check errors..
2018-06-14 15:56:02 -04:00
Michael Chisholm
0c3f826c24
First cut at splitting the Bundle implementation into v20 and
...
v21 variants. Also fixed up unit tests and got them passing
again.
2018-06-14 15:56:02 -04:00
Michael Chisholm
f211649529
Made some minimal changes to support the STIX 2.1 Malware SDO,
...
and the maec2stix tool.
2018-06-14 15:56:01 -04:00
Greg Back
75e478312a
Additional changes to match updates in v20 code.
2018-06-11 13:37:45 -05:00
Greg Back
3e159abd4d
WIP: Merge branch 'master' into stix2.1
2018-05-23 10:43:52 -05:00
Emmanuelle Vargas-Gonzalez
d51f1014c7
Fix InstrusionSet 'last_seen' in 2.1
2018-02-23 08:24:26 -05:00
Emmanuelle Vargas-Gonzalez
722d46c6c5
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into stix2.1
2017-12-08 09:36:59 -05:00
Emmanuelle Vargas-Gonzalez
f6f7d0aed8
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2017-11-02 07:48:37 -04:00
Emmanuelle Vargas-Gonzalez
bdb91c6ac4
Update STIX 2.1 structure
2017-11-02 07:21:24 -04:00