f1490a98c8
remove full path from `constants` and fix directory resolution
2018-11-29 13:49:06 -05:00
63c22aba99
fix path issues related to memory datastore
2018-11-29 12:17:26 -05:00
6e9312efb7
fix test memory datastore teardown
2018-11-29 11:48:14 -05:00
1b0fa0129f
pre-commit changes
2018-11-29 11:06:27 -05:00
7f3a8b6c80
more tests to improve coverage
2018-11-29 10:27:13 -05:00
e896812754
minor code changes
2018-11-28 16:51:35 -05:00
aaddeb8b97
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into 1.1.0-release
2018-11-28 11:21:27 -05:00
17970a3faa
Fixed a couple filter tests.
...
- a length check should come before the access, so you can verify
whether the access will succeed.
- Also removed some tests which can't work, due to the filter
changes. In fact, a lot of these tests should probably be
removed or changed if we want to disallow running
apply_common_filters() on plain dicts. They will often
coincidentally still succeed though, so I left them in.
2018-11-27 18:42:51 -05:00
f57b9c34ef
Add a newline to the end of a file
2018-11-27 17:58:01 -05:00
3adf7800a8
Changed how filters work, with respect to datetime objects.
...
Timestamp properties can now be checked against filter values
which are either strings or datetime objects, using datetime
semantics (previously, it reduced to a string compare).
If a stix object property is datetime-valued and the filter
value is a string, the string is parsed to a datetime object,
rather than the other way around.
Filtering in the filesystem store now parses JSON dicts to
_STIXBase objects before applying the filters.
Due to the parsing change, bad JSON content can produce a
different kind of error, so I had to change one of the tests.
2018-11-27 17:36:17 -05:00
d8a775c60d
Fix some more improper exception re-raises in the filesystem
...
datastore test suite. Add a new test corpus file, located so
as to test the backward compatibility functionality of
FileSystemSource. Add a test to the suite which ensures that
this new file is found.
2018-11-27 15:24:09 -05:00
f615161110
Added some tests for adding markings to sinks and stores.
2018-11-27 15:24:08 -05:00
0cecbeb9d8
Ran trailing-whitespace pre-commit hook. It changed a bunch of
...
files, in ways we don't completely understand...
2018-11-27 15:24:08 -05:00
0a8ff2ab2e
Add some newer versions of a couple of object IDs in the stix2
...
test data corpus. Updated filesystem store tests accordingly:
- Remove comments from all_versions tests stating that multiple
versions are not supported. Improve the tests to ensure that
all versions are in fact retrieved.
- Update the get() test to assure that it gets only the latest
version, when there is more than one version.
- Update some count checks, since there are more objects now
- Fix some typos
2018-11-27 15:24:07 -05:00
9693c16cd1
Adjust import order to satisfy tox import check
2018-11-27 15:24:07 -05:00
428a18ded2
Implemented clenk's suggested changes in multi-version filesystem
...
store:
- Use utils.get_type_from_id() instead of my own (I didn't know it
was already there)
- Use dict-style instead of attribute-style access to get stix
object properties
- Convert timezone-aware timestamps to UTC in _timestamp2filename()
to ensure that different times always result in different
filenames.
Also added a couple new tests for _timestamp2filename(), which
exercises the timezone conversion code.
2018-11-27 15:24:07 -05:00
0096835cfc
Add multi-version support to the filesystem datastore.
...
Factored out the _is_marking() function from the memory datastore
module to utils so it can be reused, and changed both filesystem
and memory datastore modules to import and use it.
2018-11-27 15:24:07 -05:00
c4668f5dc1
Revert "Multi version filesystem store"
2018-11-07 10:10:06 -05:00
150457c1bb
Merge pull request #222 from chisholm/multi_version_filesystem_store
...
Multi version filesystem store
2018-11-06 16:32:07 -05:00
b235e5773c
Added some tests for adding markings to sinks and stores.
2018-11-06 16:15:33 -05:00
9f83f2140b
Ran trailing-whitespace pre-commit hook. It changed a bunch of
...
files, in ways we don't completely understand...
2018-11-06 15:10:40 -05:00
a8d9aef673
Add some newer versions of a couple of object IDs in the stix2
...
test data corpus. Updated filesystem store tests accordingly:
- Remove comments from all_versions tests stating that multiple
versions are not supported. Improve the tests to ensure that
all versions are in fact retrieved.
- Update the get() test to assure that it gets only the latest
version, when there is more than one version.
- Update some count checks, since there are more objects now
- Fix some typos
2018-11-01 20:25:00 -04:00
e2d9325356
Adjust import order to satisfy tox import check
2018-11-01 20:25:00 -04:00
ee57596d6a
Implemented clenk's suggested changes in multi-version filesystem
...
store:
- Use utils.get_type_from_id() instead of my own (I didn't know it
was already there)
- Use dict-style instead of attribute-style access to get stix
object properties
- Convert timezone-aware timestamps to UTC in _timestamp2filename()
to ensure that different times always result in different
filenames.
Also added a couple new tests for _timestamp2filename(), which
exercises the timezone conversion code.
2018-11-01 20:25:00 -04:00
9486b46f77
Add multi-version support to the filesystem datastore.
...
Factored out the _is_marking() function from the memory datastore
module to utils so it can be reused, and changed both filesystem
and memory datastore modules to import and use it.
2018-11-01 20:25:00 -04:00
3b297c17b5
Use consistent errors for observable extensions
...
Whether or not the Observable type is in the EXT_MAP already, using a
custom extension without also using allow_custom=True should result in
the same behavior/error message.
2018-11-01 17:23:55 -04:00
493bd65ead
Update README and refactor code to make 2.0 default. Update some tests
2018-11-01 09:21:02 -04:00
5e5d10e7aa
Finish alignment of 2.1 components
2018-11-01 08:17:34 -04:00
eff5369670
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into stix2.1
2018-11-01 07:57:09 -04:00
3542604b02
Merge pull request #209 from chisholm/taxii_api_updates
...
Fixed a test fixture to call the cti-taxii-client Collection constructor correctly
2018-10-31 12:04:34 -04:00
db300d1f21
Fix `created` millisecond precision in TLPs
...
A marking definition's `created` property doesn't require millisecond
preprecision, but for TLP markings the TLP instances provided in the
spec must be used and they all use millisecond precision.
2018-10-25 13:58:21 -04:00
cbe8d22d0a
Added support to multi-version memory stores for markings. Also
...
added some more unit tests which test storing/retrieving markings
from the stores.
2018-10-17 20:54:53 -04:00
d614343910
Rename tests with duplicate name.
2018-10-17 07:56:10 -04:00
352749edb0
Add constrains to ObservedData and Sighting, tests updated.
2018-10-17 07:47:25 -04:00
f8a72b0937
Custom builder code updated for 3.7 support.
...
Updated properties to support more constrains.
Make all regexes literal strings.
Update tests to align to new constrains.
Workbench problem. _check_object_constraints() uses instance class to
perform proper class resolution calls.
2018-10-17 07:34:15 -04:00
864ba05b71
Fix import order to satisfy isort-check
2018-10-15 19:23:28 -04:00
d9f6a213c1
Fixed Memory source/sink/store so that it supports multiple versions
...
of objects. Fixed several bugs too.
2018-10-15 18:02:49 -04:00
acd86c80dd
Update tests to new object constraints
2018-10-15 14:48:52 -04:00
541c682bf6
Fixed a test fixture to call the cti-taxii-client Collection
...
constructor correctly. It had been recently changed to address
issue #39 in that library.
2018-09-07 17:47:24 -04:00
5648d2bc45
added to pattern guide; reverting pattern str conversion (as was already proper)
2018-08-30 11:57:20 -04:00
211b8d8cee
Add core tests and minor change to parse_observable()
2018-07-25 20:53:53 -04:00
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
21c84acc8f
Add missing properties to Relationship object and update tests
2018-07-25 12:44:46 -04:00
af2a5605ce
Add constraints to Location object
2018-07-25 12:43:57 -04:00
40d656c94c
Minor changes to tests.
2018-07-25 12:43:08 -04:00
51a499cb33
Formatting changes made by the new pre-commit hook 'add trailing commas'
...
closes #189
2018-07-13 11:10:05 -04:00
965d7fa788
Update v20 and v21 tests
...
In v20, only minor stuff that was addressing wrong spec. In v21, align tests with new/changed properties in the specs
2018-07-12 14:33:00 -04:00
281dbfb0f4
Align tests with news additions from 'master' branch.
2018-07-11 09:43:37 -04:00
a042970a1f
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into stix2.1
2018-07-11 09:41:42 -04:00
6bd797e258
Fix 'test_memory_store_object_with_custom_property_in_bundle'
...
Since Bundles objects are now added instead of the Bundle itself, it now works as intended.
2018-07-10 16:19:40 -04:00
c91bcd43f6
Fix location for test_object_property
2018-07-10 16:11:07 -04:00
48e0442439
Fix tests in 'test_properties.py'
2018-07-10 16:10:01 -04:00
d24cddb547
Temporarily skip failing tests in workbench for v20, but the approach needs to be fixed
2018-07-10 16:08:36 -04:00
4583da3ef2
Sort imports
2018-07-10 16:05:30 -04:00
ce42c02cee
Fix tests that use property objects to call in the right path
2018-07-10 15:56:22 -04:00
645a258c62
Fix file indentation
2018-07-10 14:46:46 -04:00
edd7148e3c
It appears we did not support the case when the Bundle contains 'utf-8'
2018-07-09 15:26:57 -04:00
70a1e9522b
Add 'stix2_data' test directory for v20 tests
2018-07-09 15:22:08 -04:00
0197f9fd17
Minor fixes to tests. Some datastore had strange parameters in calls.
...
Fix error values for CustomMarking and fix incorrect test data
2018-07-09 15:20:04 -04:00
646d941032
Removed 'test_memory' file and moved all tests into 'test_datastore_memory'
...
The tests under 'test_memory' were moved into a new file called 'test_datastore_composite' to make clear what we are testing.
2018-07-09 15:15:29 -04:00
546216c396
Remove unnecessary 'True' in Memory datastore tests.
2018-07-09 15:07:05 -04:00
21d5451d1c
Small changes to tests
2018-07-06 14:11:59 -04:00
49c1931b4b
Merge pull request #203 from oasis-open/200-filter-contains
...
Add "contains" filter
2018-07-05 15:47:09 -05:00
5be1636b10
Update v20 tests to ensure right methods and classes are used
2018-07-05 15:23:25 -04:00
2c5ddc14af
Update v21 tests for some missing methods, ensure we are calling and
...
using the right classes.
2018-07-05 15:21:09 -04:00
25409b2099
GH-188: Update error message for invalid IDs.
2018-07-05 11:25:48 -05:00
bfa86bf87e
Format objects in observed_data
2018-07-03 10:32:04 -04:00
04680d8a3d
First pass at making sure everything uses v21 classes and representations
2018-07-03 09:40:51 -04:00
3100fa1fb8
Move v20 tests to their own package
2018-07-03 07:02:57 -04:00
da5b16dc2f
Create v21 test package with new spec changes
2018-07-03 07:00:18 -04:00
f47809eaaf
Add "contains" filter
...
This allows filtering on, for example, observed-data objects that
contain a specific cyber observable.
2018-07-02 18:28:27 -04:00
c2f5a40986
Create new test subpackages
2018-06-30 19:36:54 -04:00
a2e2407025
GH-188: Fixes for old Python syntax.
2018-06-27 12:49:00 -05:00
d2f703b9d0
Reuse reference regex to match IDs as well.
...
Note that this means that UUIDs will no longer be converted, even when
there's an unambiguous mapping.
2018-06-27 12:27:44 -05:00
e749218f9b
GH-188: Test that references are always valid UUID v4.
2018-06-27 12:02:13 -05:00
e5903f1832
Sort constants.
2018-06-27 11:36:17 -05:00
845625c174
GH-188: WIP: Converting all IDs to be valid UUID v4.
2018-06-27 11:35:55 -05:00
59fdd3082e
Update tests.
2018-06-26 12:29:20 -04:00
abd172eb3f
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into stix2.1
2018-06-25 08:25:57 -04:00
b2c6acfbf6
GH-188: Restrict valid UUID values.
2018-06-22 14:40:30 -05:00
fdf5937a71
GH-194: Remove unnecessary allow_custom kwarg.
2018-06-21 12:15:28 -05:00
7baeb153fa
Correct "image_weight" to "image_width".
...
Fix #194 .
2018-06-20 15:24:27 -05:00
53a1a0329a
Merge branch 'master' into stix2.1
2018-06-15 10:04:00 -05:00
f09960d7ff
Revamp code related to "pretty" JSON serialization, fix lurking
...
crash bugs.
2018-06-14 21:29:50 -04:00
486c588306
Fix silly isort check errors..
2018-06-14 15:56:02 -04:00
3101584b3d
Fix test_bundle to compare against stix2.1 relationships. The
...
fixture those particular tests use creates 2.1 relationships.
2018-06-14 15:56:02 -04:00
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
ef8d45723f
Update many unit tests to work with the malware2.1 API changes
...
I made. The bundle tests and Bundle itself have not been fixed
yet in this commit.
2018-06-14 15:56:01 -04:00
2e0dfc6592
Merge remote-tracking branch 'origin/master' into stix2.1
2018-06-14 12:42:06 -05:00
858a9752df
Merge pull request #185 from LiamSennitt/master
...
fix custom STIX objects with nested dictionary error #184
2018-06-12 14:40:55 -05:00
fcffb165ad
Add tests for `find_property_index` and `iterate_over_values`
2018-06-12 14:38:35 -04:00
94d6610ca1
Merge branch 'master' of github.com:LiamSennitt/cti-python-stix2
2018-06-12 12:58:01 -04:00
9be819ea6a
Minor tweaks to return immediately after recursive call. Ensure dicts are matched alphabetically
2018-06-12 12:57:25 -04:00
bdec14937d
fix flake8 errors in new test
2018-06-12 17:45:48 +01:00
02894b5be6
add test for nested dictionary case
2018-06-12 17:32:46 +01:00
5a9f627669
Pickle-proof stix objects
2018-06-06 15:30:45 -04:00
3e159abd4d
WIP: Merge branch 'master' into stix2.1
2018-05-23 10:43:52 -05:00
d67f2da0ea
Merge pull request #181 from oasis-open/http_error
...
Http error
2018-05-22 12:53:29 -05:00
e484b7c25f
formatting
2018-05-18 11:45:40 -04:00
6004ec597c
solution to get 404 mocking problem
2018-05-18 11:19:05 -04:00
Emmanuelle Vargas-Gonzalez