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
ddc09f70c7
Set allow_custom if using a custom_properties dict
...
Fixes #179 .
2018-05-17 09:04:44 -04:00
cf972479ed
Pass allow_custom to object dicts in a Bundle
2018-05-16 15:37:30 -04:00
8fc421e7d4
think the mock client was erroneous for get_object(), couldnt get object by id, just returned random object
2018-05-16 15:17:34 -04:00
a3313bc08f
creating native DataSourceError exception class to wrap taxii client and server errors
2018-05-16 13:23:50 -04:00
69c31ca3fc
Pass allow_custom to ExtensionsProperty
...
Also fix bug caused by _properties being a class variable rather than an
instance variable. If you created an object with allow_custom,
allow_custom would be set for all future instances.
2018-05-16 12:14:33 -04:00
2b4c5bf264
handling and modifying exception messages in a manner acceptable by all python versions
2018-05-15 17:42:19 -04:00
0d3f80f2fe
removing taxii 503 error test as not reproducible in Travis environment
2018-05-15 15:41:46 -04:00
2392912533
handle TAXII client/server errors according to decided policy
2018-05-15 11:28:34 -04:00
06e5a33639
Pass allow_custom when adding to ObservedData
2018-05-11 17:28:55 -04:00
4229c380a2
Fix make_constant when value is already a constant
...
Fixes #171 .
2018-04-26 10:20:46 -04:00
c15267971d
Remove 'real_stix_objs1' as it is unused in the tests
2018-04-23 14:55:06 -04:00
2043a514e1
Add two more tests for the `dict` case in TAXIICollectionSink
2018-04-23 14:47:32 -04:00
7e5c8a9409
Sort import statements in tests.
2018-04-23 14:27:36 -04:00
2fe9a0f297
Finish adding new tests for TAXII datastore. closes #148
2018-04-23 14:15:02 -04:00
e4a226cae6
Finish merging all the changes from @mbastian1135
2018-04-23 14:14:16 -04:00
488012d39d
Add support for 'real_stix_objs' for test cases
2018-04-23 14:12:54 -04:00
99a8f9e871
Merge branch 'master' into issue-148
...
# Conflicts:
# stix2/test/test_datastore.py
# tox.ini
2018-04-23 11:04:28 -04:00
988dad79b9
WIP: Mock TAXIIClient Collection Endpoint
2018-04-23 09:11:59 -04:00
84c09d7a8f
Rename stix object fixture
2018-04-23 09:08:29 -04:00
14dce03616
Provide default for revoked, sighting:summary.
...
This allows filter on un-revoked objects. Changes default JSONEncoder to
drop optional properties with default values in the spec if set to the
default value. They can be included by passing
include_optional_defaults=True to serialize().
2018-04-16 14:37:07 -04:00
14d3543906
Merge branch 'master' into invalid-type-names
2018-04-13 16:38:17 -04:00
f127d145c4
Merge pull request #166 from oasis-open/139-dict-filter-value
...
139 dict filter value
2018-04-13 16:35:32 -04:00
6df23e7268
removed unecessary checks, (clearly I need to review python ref model)
2018-04-13 16:06:31 -04:00
a475fc6dbd
Disallow invalid type names in custom classes
2018-04-13 14:52:00 -04:00
a8b8bfe88b
Merge pull request #165 from oasis-open/161-dictionaryproperty-fixes
...
Allow dictionaries in a ListProperty
2018-04-13 14:39:04 -04:00
a614a78e22
rm testing lines
2018-04-13 14:21:44 -04:00
eba1844535
tweak to filter property checking to make sure original object property is not altered; added tests for this as well
2018-04-13 14:01:33 -04:00
58be98104f
Merge pull request #164 from oasis-open/157-allow-generic-custom-observables
...
Allow generic custom observables and custom observable extensions
2018-04-13 12:38:02 -04:00
abe252e248
Merge branch 'master' of https://github.com/oasis-open/cti-python-stix2 into 139-dict-filter-value
2018-04-13 12:35:47 -04:00
61e091baf3
added FilterSet class for internal use; modified certain parsing processes to make deepcopies or suppled values(dicts) so as to taint original user passed data; added Filter logic to handle datetime objects; added/adjusted tests accordingly
2018-04-13 12:25:12 -04:00
fc6a33b23e
Disallow missing 'type' property with allow_custom
...
There was a bug where if you allowed custom content the library would parse an
object without the required 'type' property.
2018-04-13 11:18:56 -04:00
1a1e5e1616
WIP- getting close though
2018-04-13 11:08:03 -04:00
a8b7be88d0
Add support for pretty print case list of dictionaries.
2018-04-13 11:04:07 -04:00
d08be151f7
Allow a ListProperty of DictionaryProperties
2018-04-12 21:26:48 -04:00
91376586d4
Simplify allowing custom observables/extensions
2018-04-12 16:33:08 -04:00
9ef5b395a8
Fix allowing custom observables and extensions
2018-04-12 14:20:24 -04:00
31fc1c369a
still WIP
2018-04-12 12:03:07 -04:00
333fea4d18
merge conflicts
2018-04-11 21:08:37 -04:00
ba6fa595c6
WIP - finding more issues with allowing dicts as filters
2018-04-11 20:54:16 -04:00
3e048ef325
Fix deprecated 3.6 backslash-character pairs
...
(https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior )
2018-04-11 15:46:17 -04:00
b633fd3785
WIP: Allow custom observables, extensions
2018-04-10 12:54:27 -04:00
5c5ca1f21c
Move 'extensions' property to custom Observables
...
... from custom Observable extensions (an extension doesn't need an
'extensions' property).
2018-04-09 15:35:08 -04:00
b851afba01
Req. custom extension properties as list of tuples
2018-04-09 15:34:39 -04:00
1ff640de3c
Moved some test methods here
2018-04-06 14:24:15 -04:00
cd85683f2b
WIP: Cleaned test_datastore to only include base store tests
2018-04-06 14:23:48 -04:00
0d1729bbd7
Deleted test_filesystem in favor of test_datastore_filesystem.py
2018-04-06 14:20:39 -04:00
80e4706ac4
Add some test objs previously in test_datastore.py
2018-04-06 14:19:51 -04:00
c2e7cbb3e3
Moved from test_datastore.py -> new file test_datastore_taxii.py
2018-04-06 14:18:05 -04:00
59ff0c4f26
Moved from test_datastore.py -> new file test_datastore_memory.py
2018-04-06 14:17:49 -04:00
5c4472cbbd
Moved from test_datastore.py -> new file test_datastore_filters.py
2018-04-06 14:17:19 -04:00
8f58f29358
Moved from test_datastore.py -> new file test_datastore_filesystem.py
2018-04-06 14:16:04 -04:00
a1ad90d43f
Merge pull request #150 from oasis-open/38-workbench
...
Create Workbench layer
2018-04-05 10:09:23 -05:00
e3bbc39353
Fix bug with mutable default parameter
2018-04-05 10:07:35 -04:00
589c00064b
Remove query_by_type
...
It's not that much of a shortcut and we can add it back in later if it
makes sense.
2018-04-04 14:09:54 -04:00
f61bc5e5ee
Merge pull request #154 from oasis-open/code-coverage
...
Increase code coverage, fix patterning bugs
2018-04-03 15:11:15 -05:00
dd8f0f5c72
Increase code coverage slightly
...
An Environment will always have a CompositeDataSource, so there was no way
those exceptions could get raised.
2018-04-02 16:44:57 -04:00
3abfe7868a
Add more patterning tests
...
... and fix bugs detected in doing so
2018-04-02 16:38:04 -04:00
90834c5b95
docs and tests for parse() mod
2018-03-30 13:21:07 -04:00
d453bf6f1a
Add a couple granular markings tests
2018-03-30 13:12:51 -04:00
4a2ac6df3a
Add/fix workbench docs, rename add() -> save()
2018-03-30 12:04:31 -04:00
b9bbd03481
Update workbench imports and documentation
...
Import a bunch of stuff so users can just "from stix2.workbench import *" and
not need to import other stuff (e.g. MarkingDefinition, Cyber Observable
Object classes, etc.) from stix2.
2018-03-30 12:04:31 -04:00
e48e0886a8
Improve code coverage slightly
...
Environment will always have a CompositeDataSource, so the try/catches
in add_filter/s did not make sense.
2018-03-30 12:02:27 -04:00
4fb24f14de
Allow passing add'l filters to related_to()
2018-03-30 12:02:27 -04:00
61733ad899
Add functions to set ObjectFactory default values
2018-03-30 12:02:27 -04:00
fd6d9f74e9
Move query_by_type() to DataStoreMixin
2018-03-30 12:02:27 -04:00
53c2d4fadf
Allow add'l filters in workbench query functions
2018-03-30 12:02:27 -04:00
e91b71f300
Test adding a data source to the workbench
2018-03-30 12:02:27 -04:00
5285934034
Make Workbench use implicit ObjectFactory
...
This is needed to implement functions like `set_default_creator`.
The changes to Tox are so that the wrapping we do in workbench doesn't
affect the rest of our tests. If we test them all in one go, pytest will
import all the tests before running any of them. This will cause the
workbench versions of the SDO classes to be used in all tests.
2018-03-30 12:02:27 -04:00
b2613ca62c
Add Workbench wrapper functions
2018-03-30 12:02:27 -04:00
aeff8f4bc0
Create Workbench layer
...
Contains a default implicit Environment and functions to get all objects
a specific type.
2018-03-30 12:02:27 -04:00
89cf4bc38f
WIP:allow unknown custom objects to be processed by parse; WIP: splitting up parse utility into components; found bug in tests that wasnt providing for proper teardown cleaning, fixed
2018-03-29 11:49:30 -04:00
e92db2417a
Merge pull request #147 from oasis-open/119-taxii-filters
...
119 taxii filters
2018-03-28 15:24:28 -05:00
51dcd6c184
same as last commit
2018-03-22 11:46:49 -04:00
b1579ae265
same as last commit
2018-03-22 11:36:35 -04:00
9f19245c8a
modify tests for python 3.x acceptance
2018-03-22 11:23:48 -04:00
536e56836c
adding Filter check when the Filter property is 'type', checks the value has no underscores (issue #136 )
2018-03-22 10:59:07 -04:00
7880e4a89b
passing TAXII query params in correct format to taxii2client; patching bug where TAXII query filters were being applied again locally to STIX objects via Filters (which doesnt work)
2018-03-21 17:19:05 -04:00
4e5eb88458
Increase versioning code coverage slightly
2018-03-16 16:38:29 -04:00
2fbde05e6c
putting test files in stix type folder that exists on git (bc there are files in it)
2018-03-14 19:34:07 -04:00
f4558c0958
pre-commit errors
2018-03-14 19:09:25 -04:00
af14cd4f88
more type checking of filesystem json files; added corresponding tests
2018-03-14 16:28:44 -04:00
5a71ef2e64
Fix allow_custom in functions calling new_version
2018-03-02 11:32:07 -05:00
1eab9b2832
Assume custom properties allowable in add_markings
2018-03-02 10:21:51 -05:00
5f703509be
Rename "sources" subpackage to "datastore"
...
Fix #114 .
2018-03-01 09:04:42 -05:00
7bdf786f89
Remove deprecated tests
2018-02-27 12:17:26 -05:00
57eb709c48
Merge branch 'master' into taxii_collection_source_404
2018-02-26 17:08:28 -05:00
b6c22010bb
Fix imports for test_location.py
2018-02-23 08:52:34 -05:00
06974c72f5
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into stix2.1
2018-02-23 08:21:16 -05:00
5427e79d71
Fix pycodestyle/isort issues
2018-02-19 15:03:20 -05:00
845934033e
Avoid checking valid refs when deepcopying
...
Using `deepcopy` on an Observable object that referenced another (e.g.
domain name -> resolves to -> IPv4 address) would fail because no
`_valid_refs` were available. Assuming that the references have
already been checked and are valid when using `deepcopy`, we can use a
special value ('*') to skip the valid_refs check.
This will also allow creating new versions of ObservedData objects that
contain related objects, since `new_version` calls `deepcopy`.
2018-02-19 14:44:28 -05:00
722d46c6c5
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into stix2.1
2017-12-08 09:36:59 -05:00
126094106e
Merge branch 'master' into taxii_collection_source_404
2017-11-29 22:13:16 +00:00
742d249ee0
trying to fix timing bug
2017-11-29 12:50:13 -05:00
52a052d4dd
removing debug lines; attemting to fix a Travis test error
2017-11-29 12:27:20 -05:00
2399ee62ec
adjusting tests
2017-11-29 12:03:10 -05:00
98ca928dea
Merge pull request #111 from oasis-open/89-relationships
...
Support de-referencing relationships
2017-11-27 14:19:29 +00:00
6446be310c
Clean up relationships code
2017-11-21 15:57:35 -05:00
92f7e706bf
Improve error handling in relationships/related_to
2017-11-21 10:29:57 -05:00
f481788e1e
Merge pull request #112 from samcornwell/get_type_from_id
...
Add get_type_from_id utility function
2017-11-20 15:19:24 +00:00
78612530ff
added tests for get_type_from_id
2017-11-19 22:27:31 -05:00
c03ecb5230
Update test modules
2017-11-17 08:50:40 -05:00
515ff1e53f
Clean up test
2017-11-16 16:50:27 -05:00
cfa18bfd0d
Improve Environment tests
2017-11-16 16:43:27 -05:00
29dec997a0
Add related_to()
...
Function for calling relationships() but instead of just returning the
Relationship objects, returns the STIX objects being refered to in those
Relationships.
2017-11-16 14:58:59 -05:00
1b816c3d84
Test relationships() functions
2017-11-15 16:34:07 -05:00
e6a8b555d3
Add test for CustomMarking. closes #109
2017-11-15 13:12:00 -05:00
f9ad7ceb65
Add relationships() function to Environment
2017-11-13 11:09:56 -05:00
da66f10147
Make DataStore a regular class, remove unwanted overrides, update tests. Remove CustomProperty since it is no longer needed
2017-11-08 13:53:21 -05:00
489e45ad1b
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into issue-98
2017-11-08 10:31:49 -05:00
5aa8c66bfc
Merge pull request #97 from oasis-open/memory-tests
...
Test MemoryStore saving/loading to/from file
2017-11-08 14:59:27 +00:00
19818c8573
Remove stray print()
2017-11-06 14:21:29 -05:00
0d5859b906
Test other CompositeDataSource operations
2017-11-03 15:13:00 -04:00
79475586d8
Revert object_properties() to #85 fix. Update tests accordingly
2017-11-03 14:17:36 -04:00
d6c14139f3
Extend object serialization options for _STIXBase
2017-11-03 08:02:32 -04:00
cd6c7982af
Update tests related to Datastores
2017-11-02 21:31:56 -04:00
f6f7d0aed8
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2017-11-02 07:48:37 -04:00
37e9049536
Merge pull request #93 from emmanvg/issue-91
...
Update stix2 Package Structure
2017-11-01 20:09:15 +00:00
f029a01f9a
Merge pull request #95 from oasis-open/filters
...
Change filters to allow filtering all properties
2017-11-01 20:04:48 +00:00
a17d770d34
Merge master
2017-11-01 14:17:41 -04:00
7dd222b202
Test MemoryStore saving/loading to/from file
...
Python 3 dict.values() returns a view, not a list. See
https://stackoverflow.com/a/17431716/
Fix #65 .
2017-11-01 12:51:04 -04:00
c2d1e9777b
Clean up filters
...
- Simplify an if statement since split() with no matches returns single
item list
- Rename _all_filter -> _check_property and make it a method on Filter
- Raise an error instead of returning -1
- s/field/property
2017-11-01 10:40:10 -04:00
d93bf44c00
Merge branch 'master' into 76-filesystem-bundles
2017-10-31 14:10:29 -04:00
924c72e98a
Change filters to allow filtering all properties
...
(Not just common properties)
2017-10-30 17:25:32 -04:00
a514c5a3df
Add test for _register_type()
2017-10-29 00:09:13 -04:00
612f2fbab8
Increase code coverage for filesystem datastore
...
Found a couple bugs in the process and fixed them, too.
2017-10-27 15:50:43 -04:00
f103084439
Add `bundlify` parameter to FileSystemStore/Sink
...
This brings back the option (disabled by default) to wrap objects in a bundle
when saving them to the filesystem.
2017-10-27 12:23:57 -04:00
Greg Back