27647091a5
WIP - just at stash point
2018-04-11 13:36:52 -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
f83d9a56b5
Clean up documentation
2018-04-09 13:29:53 -04:00
1d06e642a4
Bump and pin nbsphinx version
2018-04-09 09:55:29 -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
e6e72856b3
Remove query_by_type()
...
Missed these earlier.
2018-04-05 11:22:50 -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
f951b9b09e
Factor out dupl. code for creating list of filters
2018-04-04 13:50:41 -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
537dff9d2a
Merge pull request #153 from oasis-open/118-allow-generic-obj
...
118-allow generic obj and 135- split up parse()
2018-04-03 15:06:25 -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
940afb0012
Require a type when querying by type
2018-04-02 09:54:22 -04:00
0bb1bb37f1
Call parse() on stix_data
...
# Fix on MemorySource.load_from_file()
2018-04-02 07:40:25 -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
98cc86eef6
Fix workbench wrapped classes for `parse()`.
...
The wrapped classes need to be in the OBJ_MAP mapping, not just the
workbench.py globals.
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
efede51453
Skip documenting some workbench stuff
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
eeb94562f9
Clean up DataStore return value documentation
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
383bf5755e
remove debug line
2018-03-21 22:06:46 -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
3c2d877bc3
Merge pull request #145 from oasis-open/138-non-json-files
...
138 non json files
2018-03-21 13:37:27 -05:00
eeb34ebbef
Change logic for case `isinstance(stix_data, list)``
2018-03-19 12:03:25 -04:00
32cb62cca2
Make sure we return if there is nothing to add to the collection
2018-03-19 11:00:09 -04:00
4e5eb88458
Increase versioning code coverage slightly
2018-03-16 16:38:29 -04:00
c98abb18f5
Fix docs
2018-03-16 14:26:41 -04:00
7f9a3c49ea
Update TAXIICollectionSink.add() to use serialize(). Call parse() on dict objects. Pass UTF-8 strings to taxii2client. closes #134
2018-03-15 13:51:47 -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
6f762e7ea0
woops forgot file, recommit of: more type checking of filesystem json files; added corresponding tests
2018-03-14 16:32:31 -04:00
af14cd4f88
more type checking of filesystem json files; added corresponding tests
2018-03-14 16:28:44 -04:00
5820fa0845
GH-138: ignore invalid JSON files.
2018-03-14 10:06:23 -05:00
955cad8385
Clarify serialization in documentation
2018-03-13 16:01:42 -04:00
f9523f24bf
Bump version: 0.5.0 → 0.5.1
2018-03-06 12:05:53 -05:00
35679e6a6b
Bump version: 0.4.0 → 0.5.0
2018-03-06 11:45:06 -05: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
307a85c8b1
Reorder modules for API documentation
2018-03-01 13:15:02 -06:00
eb2d87ce71
Rename "DataStore" class to "DataStoreMixin"
...
Fix #116 .
2018-03-01 11:27:37 -05:00
5f703509be
Rename "sources" subpackage to "datastore"
...
Fix #114 .
2018-03-01 09:04:42 -05:00
9402cff110
Merge pull request #131 from oasis-open/taxii_collection_source_404
...
Data source/store/sink changes
2018-02-27 17:04:14 -05:00
b6f14cdd4d
Fix MemoryStore docstrings
2018-02-27 16:53:05 -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
df57f4d159
Fix typos in datasources
2018-02-26 16:56:24 -05:00
b6c22010bb
Fix imports for test_location.py
2018-02-23 08:52:34 -05:00
d51f1014c7
Fix InstrusionSet 'last_seen' in 2.1
2018-02-23 08:24:26 -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
aaff2a3a04
Appease pycodestyle
2018-02-22 09:55:15 -05:00
2886ae9961
Add links to specs in STIX Objects' documentation
2018-02-21 16:46:13 -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
e2c9354d14
GH-121: Use correct property name for IntrusionSet.last_seen
...
Fix #121
2018-01-16 08:49:15 -06:00
722d46c6c5
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into stix2.1
2017-12-08 09:36:59 -05:00
da8ae6a621
Merge branch 'taxii_collection_source_404' of https://github.com/oasis-open/cti-python-stix2 into taxii_collection_source_404
2017-12-01 11:33:34 -05:00
0c8dd7f47c
added docstring warning for utility function
2017-12-01 11:30:41 -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
4a6bca4486
Merge branch 'master' into 89-relationships
2017-11-21 16:41:21 -05:00
d355d1827e
Move `creator_of` to DataStore/DataSource
2017-11-21 16:29:06 -05:00
078474259a
Simplify `related_to`
2017-11-21 16:19:15 -05:00
6446be310c
Clean up relationships code
2017-11-21 15:57:35 -05:00
0347bb52fd
added remove_custom_stix() utility; tweaked new_version() to make it a little safer
2017-11-21 14:39:50 -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
eff51a2bb8
fixed pycodestyle failure
2017-11-19 23:00:42 -05:00
78612530ff
added tests for get_type_from_id
2017-11-19 22:27:31 -05:00
8930e72cc3
added get_type_from_id function to utils
2017-11-19 22:11:44 -05:00
7e0f911972
Add relationship_type note to docstrings
2017-11-17 17:30:24 -05:00
ec42182cb1
issue #107 , also MemorySource.load_from_file() parses JSON into python-stix2 objects now
2017-11-17 12:19:06 -05:00
c03ecb5230
Update test modules
2017-11-17 08:50:40 -05:00
da4e843993
issue #104 with TAXIICollectionSource tweak
2017-11-16 17:47:27 -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
f0331f8b9b
Reorganize DataStore code for dereferencing
...
- Move `relationships()` to DataStore like `related_to()` is. If a
DataStore implementation needs a different way to handle relationship
dereferencing (e.g. TAXII in the future, or CompositeDataSource), it
can overwrite these functions.
- Reduce code duplication.
- Check for presence of Data Source/Sink in all DataStores, not just in
Environment.
2017-11-16 16:25:57 -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
86f28644f9
Fix Python2 bug when filter value is unicode
2017-11-15 16:56:55 -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
fbce8f15fe
Allow no custom __init__() on CustomMarking
2017-11-15 12:55:34 -05:00
55cf00d7f0
Move relationships() to DataSources
2017-11-15 10:37:17 -05:00
ef3ce9f6f0
Bump version: 0.3.0 → 0.4.0
2017-11-13 16:40:58 -05:00
2dc8a97a51
Fix documentation links for v20
2017-11-13 14:14:24 -05:00
f9ad7ceb65
Add relationships() function to Environment
2017-11-13 11:09:56 -05:00
7495ea6588
Add inter-documentation links
...
So when users read the guide docs, they can click a link to go to a
relevant section in the API reference.
2017-11-09 15:42:59 -05:00
c38483b631
Improve markings docstrings
...
Including a note that the markings functions can be used as methods on
SDO/SRO/MarkingDefinition objects.
2017-11-09 10:19:57 -05:00
258ea4b82c
Some cleanup in MemoryStore
2017-11-08 14:01: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
d31b110330
Update TAXII datastores
2017-11-03 08:58:47 -04:00
d6c14139f3
Extend object serialization options for _STIXBase
2017-11-03 08:02:32 -04:00
8c2af813b2
Define CustomProperty. Make sure to update _properties dict when allow_custom=True
2017-11-02 21:56:18 -04:00
cd6c7982af
Update tests related to Datastores
2017-11-02 21:31:56 -04:00
1e591a827d
ABC for DataSink, DataStore and DataSource. Fixes across the concrete objects
2017-11-02 21:29:25 -04:00
f6f7d0aed8
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2017-11-02 07:48:37 -04:00
bdb91c6ac4
Update STIX 2.1 structure
2017-11-02 07:21:24 -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
b2ff16994f
Document new util method
2017-11-01 14:21:26 -04: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
84fa86a2fd
Fix import statement
2017-11-01 11:03:02 -04:00
06a50b0178
Update README, add DEFAULT_VERSION
2017-11-01 10:48:28 -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
482135465b
Merge pull request #92 from oasis-open/issue66
...
Fix #66 - checking STIX obj ID from TAXII server
2017-10-31 14:06:34 -04:00
d8e4f1ab98
addessing requested changes
2017-10-31 13:48:31 -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
42317ddf31
Update filesystem.py to allow_custom and version
2017-10-27 12:38:03 -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
4e3752912d
Remove stray `print` statement
2017-10-26 15:35:19 -04:00
9aefa61153
Small fix for Python 3.3, 3.4
2017-10-26 12:39:27 -04:00
8c56adda21
Update package structure
2017-10-26 11:39:45 -04:00
082973f780
whitespace - somehow pre-commit got turned off??
2017-10-25 15:18:32 -04:00
7092990565
tested code with jupyter notebook and local TAXII server
2017-10-25 14:36:20 -04:00
5dffe74867
Clean up creator_of
...
(renamed from created_by)
2017-10-24 14:20:42 -04:00
d4db4f0ab8
Define source code encoding
2017-10-24 12:53:53 -04:00
47b11453fa
Increase test coverage for memory datastore
2017-10-24 12:43:30 -04:00
5c28074364
Add `allow_custom` to datastore docstrings
2017-10-24 09:15:09 -04:00
7b6236674c
Add new tests.
2017-10-23 08:06:29 -04:00
ef98c38937
Minor changes
2017-10-23 08:04:18 -04:00
e1e368c0d2
Add created_by() function to Environment
2017-10-20 09:13:04 -04:00
476cd1ed5b
Add option for custom content to TAXII datastore
2017-10-18 18:34:08 -04:00
c6d5eee083
Separate out Memory datatstore tests
...
Makes sure custom content can be added to a MemoryStore.
2017-10-18 18:31:46 -04:00
e1d8c2872e
Don't Bundlify data in FileSystemStore
...
Don't wrap objects in a Bundle when adding them to a FileSystemStore,
but still support getting objects from FileSystemStore that were saved
in a bundle.
Also:
- Add option to allow custom content in FileSystemStore
- Simplify an if statement
- Improve FileSystem docstrings
- Remove an unnecessary parse() call in FileSystemSource.get()
2017-10-18 15:46:45 -04:00
be3e841ecb
New object test files
2017-10-18 13:58:24 -04:00
84094e9f79
Separate out filesystem tests
2017-10-18 08:27:12 -04:00
6deaddc04e
Make sure custom properties are returned by object. closes #85
2017-10-12 14:08:32 -04:00
134267bfd6
Add FileSystem test fixture, test adding bundle
2017-10-12 11:20:20 -04:00
374539a6cc
Don't try to re-parse STIX Objects when adding to Bundle.
2017-10-12 14:38:25 +00:00
cccd42d984
Make AS 'number' required, add missing props to SocketExt. closes #77
2017-10-11 15:10:06 -04:00
f6e21d2199
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into stix2.1
2017-10-11 13:31:46 -04:00
c4c2fb950e
Implement LanguageContent object. Update GranularMarking and other missing properties
2017-10-11 13:30:26 -04:00
b99d9e4132
Update confidence docstrings
2017-10-11 13:16:59 -04:00
2b6023e7bb
Allow objects with custom properties in bundles
2017-10-09 17:33:12 -04:00
2ec8205f1e
Implement confidence conversion scales
2017-10-09 07:22:19 -04:00
50f3d60259
Update branch
2017-10-06 20:34:08 -04:00
51361216e9
Bump version: 0.2.0 → 0.3.0
2017-10-06 15:40:34 -04:00
2f58d7888b
Merge branch 'master' of https://github.com/oasis-open/cti-python-stix2
2017-10-06 15:09:35 -04:00
5577686ee8
Add new STIX2.1 SDOs and additional properties
2017-10-06 15:09:14 -04:00
e57c36f525
Check custom extension properties is not empty
2017-10-06 15:05:39 -04:00
d0f3fb0b47
Merge pull request #62 from oasis-open/documentation
...
Documentation: Fixes #53 .
2017-10-06 14:33:14 -04:00
2b65f7205b
Mutex 'name' is required. Bunch of formatting, update test
2017-10-06 14:24:46 -04:00
66e57ced25
Fix merge conflicts
2017-10-06 14:19:09 -04:00
23e3b3cc20
Fix FileSystemSource.all_versions bug
...
If `get()` returned a single STIX object, `all_versions()` would return a
list of the properties/values of that object.
2017-10-06 14:02:25 -04:00
1821cdb197
Merge pull request #71 from oasis-open/more_ds_tests
...
FileSystem tests
2017-10-06 13:31:50 -04:00
63e9d6af70
Merge pull request #69 from emmanvg/master
...
Update required properties in SDOs
2017-10-06 13:30:14 -04:00
79902f361e
Merge pull request #61 from oasis-open/list_comp
...
frivolous list comprehensions converted to list()
2017-10-06 13:29:22 -04:00
a36922990f
removing list comps
2017-10-06 11:20:18 -04:00
205013000d
removing debug line
2017-10-06 11:00:39 -04:00
a26e9b589f
FileSystem tests, and test directory of sample stix2 data
2017-10-06 10:56:24 -04:00
24bc282d7e
Update required properties, indicator label and tests. closes #68
2017-10-06 10:29:30 -04:00
9ea4344ca7
Make MarkingsMixin private
...
Partially so it doesn't clog up the markings API documentation.
2017-10-05 20:50:54 -04:00
8b702c6985
Minor API docs improvements
...
- Hide "Bases" below class signatures
- Leave some empty space after tables
2017-10-05 20:44:58 -04:00
1414035e8d
Isolate TimestampConstant in test.
2017-10-05 21:54:58 +00:00
f3431c97da
nested summaries for sources
2017-10-05 18:45:31 +00:00
0dc3226048
added test for Timestamp_Constant
2017-10-05 13:43:56 -04:00
ec34aa952f
Merge branch 'documentation' of https://github.com/oasis-open/cti-python-stix2 into documentation
2017-10-04 15:59:04 -04:00
f7c17d0c07
some progress on CompositeDS guide, but includes some bug fixes in the DataSource API
2017-10-04 15:57:38 -04:00
233ee7924e
Merge branch 'master' into documentation
2017-10-04 10:38:40 -04:00
ebd28aca9d
Merge branch 'master' of https://github.com/oasis-open/cti-python-stix2
2017-10-04 10:27:18 -04:00
3891595250
Use t prefix for timestamp constant
2017-10-04 10:27:06 -04:00
5789fbce20
filesystem list comps
2017-10-04 09:47:18 -04:00
=