Chris Lenk
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
Chris Lenk
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
Michael Chisholm
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
chrisr3d
77ca5ae2f9
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2020-03-09 16:20:57 +01:00
Michael Chisholm
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
Michael Chisholm
e32b074bc9
Fix stylistic issues for pre-commit hooks.
2020-03-05 17:39:35 -05:00
Michael Chisholm
22f2b241a7
Add a missing required property to fix up an external-reference
...
test.
2020-03-05 17:38:03 -05:00
Chris Lenk
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
Chris Lenk
cdde664434
Merge branch 'master' into fix_indicator_test
2020-03-05 10:51:03 -05:00
Michael Chisholm
a5dc514403
Fix external-references to force hash keys to come from
...
hash-algorithm-ov.
2020-03-04 20:55:52 -05:00
Desai, Kartikey H
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
Chris Lenk
30a59ad776
Merge pull request #344 from chisholm/fix_ast_builder
...
Fix the pattern AST creation function
2020-03-04 13:49:16 -05:00
Chris Lenk
4f00c7ca4f
Fix patterning test
2020-03-04 13:33:54 -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
chrisr3d
0f0bc42681
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2020-03-02 15:31:39 +01:00
Michael Chisholm
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
Michael Chisholm
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
Desai, Kartikey H
055ad97a7a
Add tests for _id_contributing_properties for custom observables
2020-02-27 15:15:37 -05:00
Michael Chisholm
93a8caa09d
Remove unused import
2020-02-25 20:19:30 -05:00
Michael Chisholm
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
Michael Chisholm
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
Desai, Kartikey H
a0a8b7d0e1
Fixes #334
2020-02-21 15:40:38 -05:00
Desai, Kartikey H
1084c75d33
Fixes #334
2020-02-19 16:29:13 -05:00
Michael Chisholm
14daa1edae
Add a test case to test parse exceptions from
...
create_pattern_object().
2020-02-19 15:39:23 -05:00
Desai, Kartikey H
86f9e51a42
Fixes #336
2020-02-19 09:11:30 -05:00
Michael Chisholm
4c67142b92
Fix the filesystem store to support the new top-level 2.1 SCOs.
2020-02-15 19:02:53 -05:00
Michael Chisholm
be5274878d
Add trailing commas for pre-commit hook...
2020-02-13 17:37:59 -05:00
Michael Chisholm
98a654884d
Fix the memory store to support the new top-level 2.1 SCOs.
2020-02-13 17:11:58 -05:00
chrisr3d
5aaf07702d
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2020-02-05 21:18:14 +01:00
Chris Lenk
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
chrisr3d
dece917a68
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2020-01-31 11:38:26 +01: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
5b07887edc
Fixes #303
2020-01-28 15:41:38 -05:00
Emmanuelle Vargas-Gonzalez
88426de424
update test suite to include new property present in TLP Markings
2020-01-28 13:20:58 -05:00
chrisr3d
c8cd84925b
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2020-01-08 14:53:36 +01:00
Desai, Kartikey H
d50792b4d2
Fix tests. Fixes #307
2020-01-04 10:24:17 -05:00
Desai, Kartikey H
7a47f348a0
Introduce and relocate version-based pattern checking. Fixes #307
2020-01-04 10:24:17 -05:00
Desai, Kartikey H
a18612bdfb
Fixes #307
2020-01-04 10:24:17 -05:00
Desai, Kartikey H
32d2a0a4fd
Fixes #309
2019-12-23 17:30:34 -05:00
Chris Lenk
74eeabab77
Merge branch 'khdesai-change_logging'
...
Close #304 .
2019-12-23 17:20:32 -05:00
Chris Lenk
62cd4fd33c
Change string semantic comparison algorithm
...
Use `fuzzywuzzy`'s Token Sort Ratio instead of Jaro-Winkler.
2019-12-23 17:00:52 -05:00
Chris Lenk
457564f2f9
Update SemEq test, use dict for property weights
2019-12-20 17:01:21 -05:00
Chris Lenk
cde57ce8f7
Merge pull request #315 from khdesai/fix_issue_308
...
Fix issue 308
2019-12-17 12:13:25 -05:00
Desai, Kartikey H
6df7da65b8
Fixes #308
2019-12-17 11:57:55 -05:00
Desai, Kartikey H
8719a7206f
Fixes #308
2019-12-16 16:32:55 -05:00
chrisr3d
31d944b159
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2019-12-12 22:59:39 +01:00
Desai, Kartikey H
c09bd071d0
Make requested changes, except documentation, which is coming soon
2019-12-06 10:46:27 -05:00
Desai, Kartikey H
f09cf4867d
Remove unnecessary comments
2019-12-06 09:35:36 -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
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
chrisr3d
e2a4129ad3
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2019-10-22 01:30:57 +02:00
Chris Lenk
1d671bd144
Merge branch 'master' into stix2.1
2019-10-16 17:02:21 -04:00
Emmanuelle Vargas-Gonzalez
13fda69079
add test for object not present in configuration
2019-10-15 13:25:11 -04:00
Emmanuelle Vargas-Gonzalez
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
chrisr3d
4f1d68065a
fix: Making python imports happy in travis
2019-10-14 14:41:17 +02:00
chrisr3d
bdba2c0a63
fix: Removed comment
2019-10-14 14:27:44 +02:00
chrisr3d
bf45f26bfe
fix: Making pep8 happy
2019-10-14 14:15:26 +02:00
chrisr3d
8809418dab
fix: Updated interoperability tests with required arguments
2019-10-14 14:14:39 +02:00
chrisr3d
adbaec1942
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 + fix interoperability param support
2019-10-14 12:30:15 +02:00
Michael Chisholm
edf465bd80
Add a unit test for deterministic ID, with unicode
2019-10-11 18:15:47 -04:00
Emmanuelle Vargas-Gonzalez
de478df687
update test after merge, formatting
2019-09-23 23:27:43 -04:00
Emmanuelle Vargas-Gonzalez
88b883c91d
Merge branch 'master' into semantic-equivalence
2019-09-23 23:20:42 -04:00
Emmanuelle Vargas-Gonzalez
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
Chris Lenk
401c9ad950
Merge branch 'master' into stix2.1
2019-09-23 12:26:27 -04:00
Emmanuelle Vargas-Gonzalez
4eaaee89dc
make changes according to feedback. allow for custom objects to be supplied to method
2019-09-23 09:44:09 -04:00
Emmanuelle Vargas-Gonzalez
e138753576
add another test
2019-09-17 16:10:54 -04:00
Emmanuelle Vargas-Gonzalez
351362ae33
more tests for coverage
2019-09-17 15:55:12 -04:00
Emmanuelle Vargas-Gonzalez
09858ba263
create more tests to improve coverage
2019-09-17 15:28:37 -04:00
Emmanuelle Vargas-Gonzalez
e8eb7bcca2
fix logging messages, typos and add tests for the semantic equivalence method
2019-09-16 14:35:14 -04:00
Zach Rush
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
Desai, Kartikey H
8447c9fcd9
Add few tests to improve some code coverage
2019-09-11 14:21:41 -04:00
Desai, Kartikey H
d828e41c78
End of changes
2019-09-11 10:44:14 -04:00
Desai, Kartikey H
5b6592e2dc
Some changes. More fixes coming soon, hopefully
2019-09-06 18:08:27 -04:00
Desai, Kartikey H
8f773fd556
Temp backup of some code changes. More coming soon
2019-09-06 00:25:42 -04:00
Desai, Kartikey H
abf2980336
Fix tests and ReferenceProperty
2019-09-04 19:08:34 -04:00
chrisr3d
a739c1154e
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2019-09-03 13:47:43 +02:00
Desai, Kartikey H
44ebd64a16
Some test fixes. More coming soon
2019-08-30 03:47:47 -04:00
Desai, Kartikey H
f69b13a006
Some more updates, primarily to ReferenceProperty (and related code)
2019-08-29 17:15:51 -04:00
Desai, Kartikey H
5825118ad4
Merge branch 'stix2.1' of https://github.com/oasis-open/cti-python-stix2 into wd05SCO
2019-08-27 17:37:14 -04:00
Desai, Kartikey H
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
Michael Chisholm
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
Michael Chisholm
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
Desai, Kartikey H
7c9fc3fd08
Fix deterministic ID tests
2019-08-21 09:33:42 -04:00
Desai, Kartikey H
364daec40a
Add deterministic ID tests
2019-08-21 09:21:51 -04:00
Desai, Kartikey H
5e9d6a6a14
Fix small indentation error
2019-08-21 08:49:33 -04:00
Desai, Kartikey H
bf1b8b567d
Updates to allow existing tests to pass
2019-08-21 02:00:41 -04:00
Desai, Kartikey H
46359ead69
Modify a few things
2019-08-19 13:35:17 -04:00
Desai, Kartikey H
ec55463398
Update SCO stuff to WD 05
2019-08-19 09:39:13 -04:00
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
Chris Lenk
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
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
9404cf4560
Fix flake8 style error.
2019-07-25 16:58:48 -04:00
Michael Chisholm
423487d65a
Add a unit test for the first/last_seen value co-constraint
...
on ThreatActor.
2019-07-25 16:57:15 -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
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
Michael Chisholm
823b67a4fc
Add a few more tests to exercise more complex property presence
...
constraint checking.
2019-07-19 15:40:03 -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