2472af387b
Change a SWID tagId in a unit test from a UUID to something
...
more plausible.
2020-03-11 15:21:34 -04:00
33fb31421b
Merge pull request #357 from chisholm/malware_analysis_result
...
Update malware-analysis SDO's av_result property
2020-03-11 09:16:34 -04:00
bdf7cab8fe
Merge pull request #356 from chisholm/malware_analysis_sample_ref
...
Add the "sample_ref" property to malware-analysis SDOs
2020-03-11 09:12:02 -04:00
2429533e4f
Merge pull request #355 from chisholm/optional_type_properties
...
Changed several *_types properties to be optional due to STIX spec change
2020-03-11 09:08:42 -04:00
d708537b85
Add enforcement of a new STIX 2.1 SCO extension name requirement:
...
that it must end with "-ext".
2020-03-10 20:24:53 -04:00
792cc570d7
Change the os_execution_envs property of software SCOs to
...
operating_system_refs, and add a test for it.
2020-03-06 19:43:47 -05:00
e32b074bc9
Fix stylistic issues for pre-commit hooks.
2020-03-05 17:39:35 -05:00
22f2b241a7
Add a missing required property to fix up an external-reference
...
test.
2020-03-05 17:38:03 -05:00
3803e4bdd7
Merge pull request #343 from chisholm/sco_tlo_filesystemstore
...
Fix the filesystem store to support the new top-level 2.1 SCOs.
2020-03-05 17:08:20 -05:00
cdde664434
Merge branch 'master' into fix_indicator_test
2020-03-05 10:51:03 -05:00
a5dc514403
Fix external-references to force hash keys to come from
...
hash-algorithm-ov.
2020-03-04 20:55:52 -05:00
8810983ca0
Merge branch 'master' of https://github.com/oasis-open/cti-python-stix2 into fix_issue_351
2020-03-04 14:16:54 -05:00
30a59ad776
Merge pull request #344 from chisholm/fix_ast_builder
...
Fix the pattern AST creation function
2020-03-04 13:49:16 -05:00
4f00c7ca4f
Fix patterning test
2020-03-04 13:33:54 -05:00
4e2b018272
Add a property to the software SCO, due to STIX spec change.
2020-03-02 16:57:18 -05:00
d2bff4d411
Update malware-analysis SDO's av_result property: replace it with
...
result and result_name properties. Per:
https://github.com/oasis-tcs/cti-stix2/issues/213
2020-02-27 17:26:04 -05:00
50eb188190
Add the "sample_ref" property to malware-analysis SDOs, per:
...
https://github.com/oasis-tcs/cti-stix2/issues/210
2020-02-27 16:40:56 -05:00
055ad97a7a
Add tests for _id_contributing_properties for custom observables
2020-02-27 15:15:37 -05:00
93a8caa09d
Remove unused import
2020-02-25 20:19:30 -05:00
31c37a9b12
Changed several *_types properties which were formerly required,
...
to be optional, due to a STIX spec change. Updated unit tests
accordingly.
2020-02-25 20:07:47 -05:00
274abc52e9
An exception message changed as a result of a pattern-validator
...
update. This broke a unit test which was testing the message.
I updated the test.
2020-02-24 20:02:26 -05:00
a0a8b7d0e1
Fixes #334
2020-02-21 15:40:38 -05:00
1084c75d33
Fixes #334
2020-02-19 16:29:13 -05:00
14daa1edae
Add a test case to test parse exceptions from
...
create_pattern_object().
2020-02-19 15:39:23 -05:00
86f9e51a42
Fixes #336
2020-02-19 09:11:30 -05:00
4c67142b92
Fix the filesystem store to support the new top-level 2.1 SCOs.
2020-02-15 19:02:53 -05:00
be5274878d
Add trailing commas for pre-commit hook...
2020-02-13 17:37:59 -05:00
98a654884d
Fix the memory store to support the new top-level 2.1 SCOs.
2020-02-13 17:11:58 -05:00
c96b74294a
Merge pull request #331 from chisholm/remove_values_workaround
...
Remove workaround for "values" being both a Mapping method name and STIX property name
2020-02-04 10:39:42 -05:00
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
5b07887edc
Fixes #303
2020-01-28 15:41:38 -05:00
88426de424
update test suite to include new property present in TLP Markings
2020-01-28 13:20:58 -05:00
d50792b4d2
Fix tests. Fixes #307
2020-01-04 10:24:17 -05:00
7a47f348a0
Introduce and relocate version-based pattern checking. Fixes #307
2020-01-04 10:24:17 -05:00
a18612bdfb
Fixes #307
2020-01-04 10:24:17 -05:00
32d2a0a4fd
Fixes #309
2019-12-23 17:30:34 -05:00
74eeabab77
Merge branch 'khdesai-change_logging'
...
Close #304 .
2019-12-23 17:20:32 -05:00
62cd4fd33c
Change string semantic comparison algorithm
...
Use `fuzzywuzzy`'s Token Sort Ratio instead of Jaro-Winkler.
2019-12-23 17:00:52 -05:00
457564f2f9
Update SemEq test, use dict for property weights
2019-12-20 17:01:21 -05:00
cde57ce8f7
Merge pull request #315 from khdesai/fix_issue_308
...
Fix issue 308
2019-12-17 12:13:25 -05:00
6df7da65b8
Fixes #308
2019-12-17 11:57:55 -05:00
8719a7206f
Fixes #308
2019-12-16 16:32:55 -05:00
c09bd071d0
Make requested changes, except documentation, which is coming soon
2019-12-06 10:46:27 -05:00
f09cf4867d
Remove unnecessary comments
2019-12-06 09:35:36 -05:00
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
806c6c52d9
Added tests for other changes, and moved attribute defaults to an init function
2019-11-25 15:52:50 -05:00
46f1778d04
Fixed all issues brought up in issue #305 by Chris Lenk
2019-11-22 13:24:09 -05:00
1d671bd144
Merge branch 'master' into stix2.1
2019-10-16 17:02:21 -04:00
13fda69079
add test for object not present in configuration
2019-10-15 13:25:11 -04:00
024e023967
update semantic equivalence approach to:
...
- add more detailed output via the logging module
- don't fail hard if an object sent to the semantically_equivalent() method
- remove specific exception related to Semantic Equivalence and tests
2019-10-15 12:54:41 -04:00
edf465bd80
Add a unit test for deterministic ID, with unicode
2019-10-11 18:15:47 -04:00
de478df687
update test after merge, formatting
2019-09-23 23:27:43 -04:00
88b883c91d
Merge branch 'master' into semantic-equivalence
2019-09-23 23:20:42 -04:00
dc79a1f869
add docstrings for new public methods. add test with disabled spec_version check.
...
fix calculation for distance, using incorrect algorithm. update package settings, tox settings
2019-09-23 23:13:50 -04:00
401c9ad950
Merge branch 'master' into stix2.1
2019-09-23 12:26:27 -04:00
4eaaee89dc
make changes according to feedback. allow for custom objects to be supplied to method
2019-09-23 09:44:09 -04:00
e138753576
add another test
2019-09-17 16:10:54 -04:00
351362ae33
more tests for coverage
2019-09-17 15:55:12 -04:00
09858ba263
create more tests to improve coverage
2019-09-17 15:28:37 -04:00
e8eb7bcca2
fix logging messages, typos and add tests for the semantic equivalence method
2019-09-16 14:35:14 -04:00
4753519349
Marking-definitions are now checked for their attribute before being tested and tests were modified to expect the correct value
2019-09-13 10:52:50 -04:00
8447c9fcd9
Add few tests to improve some code coverage
2019-09-11 14:21:41 -04:00
d828e41c78
End of changes
2019-09-11 10:44:14 -04:00
5b6592e2dc
Some changes. More fixes coming soon, hopefully
2019-09-06 18:08:27 -04:00
8f773fd556
Temp backup of some code changes. More coming soon
2019-09-06 00:25:42 -04:00
abf2980336
Fix tests and ReferenceProperty
2019-09-04 19:08:34 -04:00
44ebd64a16
Some test fixes. More coming soon
2019-08-30 03:47:47 -04:00
f69b13a006
Some more updates, primarily to ReferenceProperty (and related code)
2019-08-29 17:15:51 -04:00
5825118ad4
Merge branch 'stix2.1' of https://github.com/oasis-open/cti-python-stix2 into wd05SCO
2019-08-27 17:37:14 -04:00
49077352d7
Updates and corrections for SCO WD 05 updates. Temp backup; testing and more fixes coming soon
2019-08-27 17:36:45 -04:00
94bb76f669
Fix docstring on the unit tests I added. I'd said "partially
...
cleaned" property, but actually, the cleaning algorithm works on
a dict copy, so aborting cleaning partway through doesn't
actually affect the object in that way. It would actually cause
the extensions property to be completely uncleaned, rather than
partially cleaned.
2019-08-26 17:49:55 -04:00
c212c7c678
Fix handling of custom extensions: make sure when
...
allow_custom=True that you never get a half-cleaned property
value.
2019-08-26 17:10:54 -04:00
7c9fc3fd08
Fix deterministic ID tests
2019-08-21 09:33:42 -04:00
364daec40a
Add deterministic ID tests
2019-08-21 09:21:51 -04:00
5e9d6a6a14
Fix small indentation error
2019-08-21 08:49:33 -04:00
bf1b8b567d
Updates to allow existing tests to pass
2019-08-21 02:00:41 -04:00
46359ead69
Modify a few things
2019-08-19 13:35:17 -04:00
ec55463398
Update SCO stuff to WD 05
2019-08-19 09:39:13 -04:00
dee2f1f60c
Merge branch 'stix2.1' of https://github.com/oasis-open/cti-python-stix2 into wd05SCO
2019-08-12 08:16:00 -04:00
b981cdf4fc
Fix tests
...
by removing certain human message assertions from test suites.
(These changes are cherry-picked from commit by @khdesai on a different
branch)
2019-08-09 16:04:29 -04:00
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
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
9404cf4560
Fix flake8 style error.
2019-07-25 16:58:48 -04:00
423487d65a
Add a unit test for the first/last_seen value co-constraint
...
on ThreatActor.
2019-07-25 16:57:15 -04:00
8362d80206
Change "object_modified" property of LocationContent to be
...
optional. Add a corresponding unit test.
2019-07-25 16:56:34 -04:00
165d87e103
Revert the import in the top-level stix2 package, to v20. This
...
additionally required:
- Removing the v21 workbench test suite and reinstating the v20
test suite
- Fixing up a few v20 unit tests to work with the workbench
monkeypatching.
- I didn't revert the analogous changes I'd previously made to
the v21 unit tests, because I think they make sense even when
the workbench monkeypatching isn't happening.
2019-07-22 16:55:22 -04:00
823b67a4fc
Add a few more tests to exercise more complex property presence
...
constraint checking.
2019-07-19 15:40:03 -04:00
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
4660d5ea28
Update SCO specs per WD 05 specs
2019-07-17 15:48:09 -04:00
cd0c4984fa
Fix most unit tests to pass again. Awaiting feedback regarding
...
possible library bugs, before I fix the remaining unit tests.
2019-07-16 16:10:25 -04:00
b464a9cc0a
Remove certain human message assertions from test suites
2019-07-09 13:34:19 -04:00
ae35d2ab01
Add and update tests to conform code to WD04 SDO specs
2019-07-02 13:17:43 -04:00
ffbf5fa34c
Fix JSON encoding issue within tests
2019-07-01 15:41:44 -04:00
c98fcafb1a
Update tests to address conformance to WD04 specs
2019-07-01 15:26:30 -04:00
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
266516ebbc
Merge pull request #272 from chisholm/malware_analysis
...
Add stix2.1 malware-analysis SDO
2019-06-28 09:57:47 -04:00
e779cacf3e
Update course of action tests, to include tests with the
...
action_reference property. Also, stylistic changes to hopefully
let it do more testing with less code.
2019-06-26 21:01:41 -04:00
c6132537b8
Changes from add-trailing-comma hook
2019-06-26 17:17:16 -04:00
68f93f4110
Oops, forgot to add the malware-analysis test suite...
2019-06-26 17:10:04 -04:00
b8c5bec101
Merge branch 'master' into stix2.1
2019-06-26 12:22:40 -04:00
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
d61b543266
Style changes to satisfy the 'style' tox check
2019-06-14 18:10:38 -04:00
da5978d317
Factored out more of the STIX identifier validity checking,
...
partly inspired by PR #263 . This resulted in some error message
format changes (an improvement, I think), which caused some
unit test breakage. Removed those asserts from the unit tests,
since tests shouldn't be testing human-targeted error messages.
2019-06-13 18:37:21 -04:00
ed106f23ff
Update IDProperty and ReferenceProperty to support both stix 2.0
...
and 2.1 rules regarding identifiers. Change relevant property
tests to specify which spec version to use, and modify tests
according to the specs.
2019-06-12 20:19:47 -04:00
4f593e6d16
Changes from the add-trailing-comma pre-commit hook
2019-06-12 14:49:34 -04:00
caa1d45ae2
Update stix2.1 course-of-action support to the latest spec.
2019-06-11 18:10:02 -04:00
a6fa3ff1d7
Slightly change bundle error message
2019-05-22 11:05:01 -04:00
86790a736f
Fixes #257
2019-05-20 15:29:01 -05:00
45d3020518
Fixes #257
2019-05-17 14:21:35 -05:00
a61344a8aa
Add get_obj function to bundle.py to make accessing bundles easier
2019-05-14 13:48:54 -04:00
f79b3c9876
Add functionality to _valid_refs to accept actual cyber observable objects instead of just strings with their types
2019-05-10 10:22:45 -04:00
087ac35f38
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into 252-TLPMarking-constraints
2019-05-08 10:43:13 -04:00
9c34e2f8ca
update tests to make sure we are testing the serialized instance correctly
2019-05-08 10:36:31 -04:00
582ba2be2c
Merge pull request #259 from emmanvg/251-lang-markings-support
...
Language markings support
2019-05-08 09:48:21 -04:00
4b21708e03
modify test to cover exception message
2019-05-03 11:05:32 -04:00
b3a601e4c8
add new files for marking-definition tests
2019-05-03 10:25:11 -04:00
fff0e9e731
update test_datastore_filesystem.py to create proper tlp markings
2019-05-03 09:58:45 -04:00
c3aecd76ba
update unnecesary property clean-up and add tests
2019-04-23 09:27:21 -04:00
f8857569d5
Add header to test file
2019-04-23 07:48:51 -04:00
dbc63b7b9f
pre-commit changes
2019-04-23 07:43:56 -04:00
0c78acafd0
add tests to cover the language aspect of the markings
2019-04-22 15:26:21 -04:00
e748923f19
Fixes #248
2019-04-17 10:08:34 -04:00
e976f0a926
Trim location tests
...
We can rely on defaults for some properties we aren't testing.
2019-02-08 14:17:19 -05:00
edfe0ba51a
Add support for Bing Maps and corresponding tests. Fixes #86
2019-02-08 09:37:27 -05:00
516789400b
Merge branch 'master' of https://github.com/khdesai/cti-python-stix2 into location_issue_86
2019-02-07 10:37:37 -05:00
8be704a5b9
Update to_map_url and add tests. Fixes #86
2019-02-07 10:31:51 -05:00
69d2529f0e
Fix style issues
2019-02-06 15:23:00 -05:00
a788dbb64c
Replace most SDO/SRO values in tests with IDs from constants.py
2019-01-29 10:52:59 -05:00
10bfde0e86
Merge branch 'master' of https://github.com/khdesai/cti-python-stix2 into fix_issue_245
2019-01-29 08:31:47 -05:00
b4d4a582ce
Update timestamps in v20 testsuite JSON files
2019-01-23 13:42:25 -05:00
cdac66c04d
Update v21 test suite. Fixes #245
2019-01-23 10:56:20 -05:00
5fb69e1d44
Start updating test suites to fix issue 245
2019-01-22 21:25:09 -05:00
f59db77352
Update v21 tests and add them to v20 test suite
2019-01-22 12:42:47 -05:00
dda8a7f724
Add two tests to ensure millisecond precision is used in timestamps irrespective of user-provided precision
2019-01-22 10:05:22 -05:00
5658cebf57
Update JSON files so timestamps are only precise to the millisecond (3 decimal points), per the specs
2019-01-18 13:28:37 -05:00
8c3ecd1c48
Merge pull request #237 from oasis-open/236-WindowsRegistryKey
...
Fix error when printing WindowsRegistryKey
2019-01-09 11:12:46 -05:00
26a658b789
Update test to v21
2019-01-08 09:41:53 -05:00
67d3970a50
Update test_observed_data.py
...
Change to correct version
2019-01-08 09:35:01 -05:00
ab687d8d0e
Test empty extension property serialization
2019-01-07 15:22:08 -05:00
2966efa4f0
Remove dictionary/extension property non-empty req
...
Only bundle.objects and observed-data.objects have a requirement to
include at least one item.
2019-01-07 11:15:47 -05:00
34002c4f7c
Fix error when printing WindowsRegistryKey
...
Caused by WindowsRegistryKey having a 'values' property. Fixes #236 .
2018-12-21 14:33:59 -05:00
7d84c63e8e
pre-commit formatting changes
2018-12-11 13:23:43 -05:00
3f02925fc9
add new pattern_expressions tests to proper locations
2018-12-11 13:07:53 -05:00
96b81fc489
pre-commit formatting changes
2018-12-06 15:19:50 -05:00
01df0ccc57
Add new files for the test/v2X/stix2_data/ directory
2018-12-06 15:18:25 -05:00
bfa49ce37a
Removed everything in test/v21/stix2_data/
...
Bring back optional version parameter to datastores. Update
documentation. Update v21 test suite
2018-12-06 15:11:30 -05:00
c62b9e92e7
revamp code in MockTAXIICollectionEndpoint, add more tests
2018-11-29 18:36:37 -05:00
06716e3cfd
remove redundant/unreachable code in core, add tests
2018-11-29 14:41:57 -05:00
aa649d4727
more pre-commit changes
2018-11-29 13:50:05 -05:00
f1490a98c8
remove full path from `constants` and fix directory resolution
2018-11-29 13:49:06 -05:00
Michael Chisholm