Desai, Kartikey H
998b4c0725
Change streamlined_obj_vals list to streamlined_object dict
2020-05-13 12:45:16 -05:00
Desai, Kartikey H
9ce299b660
Fixes #389
2020-05-13 11:40:37 -05:00
Desai, Kartikey H
65d4060e6a
Fixes #389
2020-05-13 11:23:26 -05:00
Desai, Kartikey H
0b1297b14a
Fixes #389
2020-05-13 11:22:51 -05:00
Desai, Kartikey H
de3fa99a12
Add property names to canonicalization for deterministic id gen
2020-05-13 11:20:16 -05:00
Chris Lenk
31cb2f85be
Bump version: 1.3.1 → 1.4.0
2020-04-03 17:44:52 -04:00
Chris Lenk
df92770d25
Merge pull request #384 from oasis-open/365-versioned-classes
...
Validate custom type/property name formats
2020-04-03 17:30:24 -04:00
Emmanuelle Vargas-Gonzalez
2b0d63c4b1
update test_datastore_taxii.py conftest.py for latest changes in medallion. add extra data used by filter
2020-04-03 17:19:36 -04:00
Chris Lenk
c7fb79d195
Fix some TAXII DataStore tests
2020-04-03 15:58:56 -04:00
Chris Lenk
9145bdf5e8
Merge pull request #374 from chisholm/version_precision
...
Support STIX 2.1 version precision
2020-04-03 15:52:42 -04:00
Chris Lenk
0d770972cf
Merge pull request #382 from oasis-open/more-pattern-tests
...
More pattern tests
2020-04-03 11:24:43 -04:00
Chris Lenk
e730d45d44
Use DEFAULT_VERSION in create_pattern_object()
2020-04-03 10:45:36 -04:00
Chris Lenk
14540c0ea1
Clean up _register_* functions
...
Made them consistent with _register_observable_extension, by:
- moving validation logic there from _custom_*_builder functions
- using a new function for ensuring properties are dict-like
- using the library default spec version instead of None
Fix #371 , fix #372 , fix #373 .
2020-04-02 14:15:45 -04:00
Chris Lenk
bbf0f81d5f
Merge pull request #376 from khdesai/fix_issue_363
...
Fix existing tests and add new tests. Fixes #363
2020-04-02 13:42:02 -04:00
Chris Lenk
d33adbcc71
Rename test files to align with module renaming
2020-04-02 08:22:49 -04:00
Chris Lenk
13cddf9d6d
Move TypeProperty format checks to __init__
...
TypeProperty uses a fixed value, so check() was never called. This way
also runs the check at object registration time because the wrapper
creates an instance of TypeProperty and doesn't have to wait for the
object to be instantiated so clean() can be called.
Also fix some tests.
2020-04-02 08:17:34 -04:00
Chris Lenk
03cb225932
Merge branch 'master' into 365-versioned-classes
2020-04-02 06:02:20 -04:00
Chris Lenk
897e884217
Fix some testing
2020-04-02 04:46:11 -04:00
Chris Lenk
c494a2e477
Use TypeProperty.clean() to verify type format
2020-04-01 21:52:04 -04:00
Desai, Kartikey H
c911cff97f
Add duplicate checking to markings and observable extensions, and fix some tests and add some tests. Fixes #363
2020-03-27 14:58:18 -04:00
Rich Piazza
1a2b1367cf
flaky 2
2020-03-27 14:06:24 -04:00
Rich Piazza
9933f88975
few more pattern op tests
2020-03-27 13:59:03 -04:00
Rich Piazza
e3ebb6393d
flaky
2020-03-27 12:33:24 -04:00
Rich Piazza
202111acdf
more pattern tests
2020-03-27 11:22:00 -04:00
Rich Piazza
46219bf072
add 2.1 links
2020-03-27 09:36:10 -04:00
Chris Lenk
b4700e6d00
Fix import errors
...
And pin medallion version for testing.
2020-03-27 06:33:29 -04:00
Chris Lenk
50df6f1474
Rename core.py -> parsing.py
2020-03-27 05:53:39 -04:00
Chris Lenk
01ba190525
Reorganize bases, use isinstance to check version
...
Renamed STIXDomainObject -> _DomainObject.
Renamed STIXRelationshipObject -> _RelationshipObject.
2020-03-27 02:40:42 -04:00
Desai, Kartikey H
a7e9a7dde5
Merge branch 'master' of https://github.com/oasis-open/cti-python-stix2 into fix_issue_363
2020-03-26 23:27:51 -04:00
maxbachmann
d11b812a0e
round result
2020-03-26 20:28:09 +01:00
maxbachmann
9388a9820f
use rapidfuzz instead of fuzzywuzzy
2020-03-23 02:16:36 +01: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
Desai, Kartikey H
1a1ad90388
Fixes #363
2020-03-20 17:37:15 -04:00
Desai, Kartikey H
b06bc1afc1
Fix import issues
2020-03-20 17:32:18 -04:00
Desai, Kartikey H
f37b84a564
Pull in updates from master
2020-03-20 16:52:21 -04:00
Desai, Kartikey H
1260c7b45e
Fix existing tests and add new tests. Fixes #363
2020-03-20 16:49:20 -04:00
Rich Piazza
2dea4caf00
fix re so they begin with ^
2020-03-20 14:24:16 -04:00
Rich Piazza
d8a9fc2306
flaky
2020-03-20 13:15:42 -04:00
Rich Piazza
9e5e998c3d
don't allow leading '_' on custom properties, whenever allow_custom is true
2020-03-20 12:49:20 -04:00
Rich Piazza
2c4e47de56
remove leading - from type name re
2020-03-20 11:56:09 -04:00
Rich Piazza
6e4151aeeb
flaky
2020-03-19 16:49:46 -04:00
Rich Piazza
fe919049b8
fix marking test
2020-03-19 16:43:37 -04:00
Rich Piazza
f60e4170fd
finish 365
2020-03-19 16:11:52 -04:00
Rich Piazza
844ec2c3bf
more on issue 365
2020-03-19 14:16:48 -04:00
Rich Piazza
9699c78ad8
issue-365
2020-03-19 10:40:35 -04:00
Michael Chisholm
1741cc9f6b
Fix import sort order for the import sorter precommit hook
2020-03-17 20:26:21 -04:00
Michael Chisholm
6f43814918
Add xfail mark to a unit test which trips a Python 3.6 bug.
...
https://bugs.python.org/issue32404
2020-03-17 20:21:09 -04:00
Michael Chisholm
f99665f2ba
One more comma, because python 3.8's add-trailing-comma
...
pre-commit hook doesn't add all the commas Travis's hook
script expects...
2020-03-17 19:45:39 -04:00
Michael Chisholm
cf9aef59c2
More flake8 style fixes
2020-03-17 18:28:38 -04:00
Michael Chisholm
a9ac7ce838
pre-commit hook changes, e.g. trailing commas, import sorting,
...
flake8 style.
2020-03-17 18:26:57 -04:00
Michael Chisholm
4aa69fa7c9
Add support for enforcing STIX 2.1 minimum precision requirement
...
on versioning timestamps.
2020-03-16 20:25:38 -04:00
Chris Lenk
6842abb371
Merge pull request #370 from chisholm/observable_extension_names_ext
...
New STIX 2.1 SCO extension name requirement: must end with "-ext"
2020-03-12 17:26:26 -04:00
Michael Chisholm
15316e7933
Added "x-" to SCO extension names in unit tests, to illustrate
...
best practice and follow a spec "should" rule.
2020-03-12 16:20:32 -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
5abc139e79
Merge branch 'khdesai-fix_issue_338'; Close #347
2020-03-12 09:30:52 -04:00
Chris Lenk
3dd9351d38
Bring back lang, confidence for Course of Action
2020-03-12 09:24:43 -04:00
Desai, Kartikey H
82517ae284
Fixes #338
2020-03-12 09:24:43 -04:00
Desai, Kartikey H
8885a757cb
Fix properties spec version back to 2.1, and re-adjust tests. Fixes #338
2020-03-12 09:24:43 -04:00
Desai, Kartikey H
36f7035785
Fixes #338
2020-03-12 09:24:43 -04:00
Chris Lenk
e782d095ea
Merge pull request #369 from chisholm/malware_os_refs
...
Change software SCO: os_execution_envs -> operating_system_refs
2020-03-11 23:47:14 -04:00
Chris Lenk
94e3cd7ca6
Merge pull request #360 from chisholm/enforce_hash_keys
...
Enforce hash keys on 2.1 external-references
2020-03-11 23:13:55 -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
2472af387b
Change a SWID tagId in a unit test from a UUID to something
...
more plausible.
2020-03-11 15:21:34 -04:00
Chris Lenk
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
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
371bf0b9a4
Add trailing commas for git commit hook...
2020-03-10 21:21:53 -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
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
Chris Lenk
380926cff5
Bump version: 1.3.0 → 1.3.1
2020-03-06 09:50:09 -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
Michael Chisholm
a862b930be
Add parent_directory_ref as an ID contributing property for the
...
file SCO.
2020-03-05 17:18:32 -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
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
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
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
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
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
796a4e20fa
Correct bug in recursive dict loop. Fixes #334
2020-02-21 15:26:19 -05:00
Michael Chisholm
1959cc6097
Removed a bunch of no-longer-used imports from pattern_visitor.py
2020-02-19 16:45:15 -05:00
Michael Chisholm
76a6eb5873
Greatly simplify the create_pattern_object() function to take
...
advantage of the pattern validator library's Pattern.visit()
method.
2020-02-19 16:39:15 -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
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
cfb7c4c73b
Fix stix2.pattern_visitor.create_pattern_object() so its
...
documentation at least isn't wrong, and it behaves better.
2020-02-17 19:26:21 -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
Michael Chisholm
f86b6e8a66
More add-trailing-comma junk, which is not done by the python 3.8
...
pre-commit add-trailing-comma library. Hopefully this satisfies
the travis tests for other versions of python!
2020-02-07 19:15:59 -05:00
Michael Chisholm
bf83ca62b3
Add trailing commas for the pre-commit hook......
2020-02-07 18:58:45 -05:00
Michael Chisholm
19707677c9
Fix STIX version detection from dicts. In particular, 2.1 SCOs
...
without the spec_version property ought to be correctly detected
as 2.1 now.
2020-02-07 18:17:12 -05: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
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
Emmanuelle Vargas-Gonzalez
6f4e819c73
update check_tlp_marking() to contain new representation for TLP markings
2020-01-28 13:20:20 -05:00
Emmanuelle Vargas-Gonzalez
9463884170
add optional "name" StringProperty to MarkingDefinition
...
update TLP_* v21 constants according to spec
2020-01-28 13:19:23 -05:00
Emmanuelle Vargas-Gonzalez
c467f198c8
add encoding to MemorySource load_from_file()
2020-01-15 14:15:08 -05:00
Emmanuelle Vargas-Gonzalez
25cfb25ef3
add encoding and propagate accordingly for calls
2020-01-15 14:12:58 -05:00
Chris Lenk
92f413a2e0
Bump version: 1.2.1 → 1.3.0
2020-01-04 19:40:01 -05:00
Chris Lenk
3092d88154
Fix trailing comma
2020-01-04 18:02:01 -05:00
Chris Lenk
e3c2a3a57b
Fix error: dict keys changing during iteration
2020-01-04 14:48:49 -05:00
Chris Lenk
6c0fba0e67
Add Python3.8 support, fix import
...
Uses try/catch to still support 2.7 too
2020-01-04 13:50:06 -05: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
4350680e79
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
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
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
Chris Lenk
77eda29471
Add default weight_dict to documentation
...
for semantic equivalence
2019-12-11 13:13:36 -05:00
Desai, Kartikey H
f6e75cd8f8
Add debug logging messages and add documentation to equivalence.ipynb
2019-12-06 10:46:27 -05: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
2b180c40b5
Remove unnecessary functions
2019-12-06 10:46:27 -05:00
Desai, Kartikey H
f5d199bedf
Generalize checking functionality within environment.py and add prop_scores dict so all scoring info is one python object
2019-12-06 10:46:27 -05:00
Desai, Kartikey H
a350ad01ac
Fixes #310
2019-12-06 09:54:00 -05:00
Chris Lenk
e9795a945b
Fix long line
2019-12-06 09:40:27 -05:00
Desai, Kartikey H
54ecba736d
Add docstring for enumerate_types()
2019-12-06 09:35:36 -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
Desai, Kartikey H
aee296ea46
Fixes #296
2019-12-06 09:35:36 -05:00
Zach Rush
9a56344d92
Forgot to add TLSH to a different regex
2019-11-25 16:14:23 -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
Chris Lenk
d4c0115735
Bump version: 1.2.0 → 1.2.1
2019-10-16 17:24:16 -04: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
Michael Chisholm
edf465bd80
Add a unit test for deterministic ID, with unicode
2019-10-11 18:15:47 -04:00
Michael Chisholm
216b43d49e
Fix determinstic UUID handling when there are high-codepoint
...
unicode characters. Make compatible with both python 2 and 3.
2019-10-11 17:12:44 -04:00
Chris Lenk
c6936ae7a2
Bump version: 1.1.3 → 1.2.0
2019-09-25 16:04:07 -04:00