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
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
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
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
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
2b6023e7bb
Allow objects with custom properties in bundles
2017-10-09 17:33:12 -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
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
616ec6bbeb
frivalous list comprehensions converted to list()
2017-10-03 16:20:03 -04:00
3ca8cf820e
Add STIXDomainObject and STIXRelationshipObject
2017-10-03 15:01:55 -04:00
2bdf83401a
Add a shortcut for marking functions
...
So marking functions like `add_markings()` can be directly called as methods on
SDO/SRO classes. Note that they return new versions of the objects
because objects are immutable.
2017-10-03 10:28:58 -04:00
3b9e52ce19
parsing taxii filters not needed when retrieving by id
2017-10-02 16:43:08 -04:00
58db629de8
Add markings functions to top level namespace
2017-10-02 16:09:38 -04:00
035f1a6c73
Support MarkingDefinition objs, not just ID strs
...
(when passed into `add_markings()` or `remove_markings()`)
2017-10-02 12:28:47 -04:00
fea2499ae2
forgot to pull doc branch down first, after having merged master into doc branch locally (to get access to DataStore/Filter code
2017-09-29 16:03:48 -04:00
4af665bf81
merge conflicts
2017-09-29 15:47:39 -04:00
9e21a69c7f
Merge branch 'master' into documentation
2017-09-29 19:14:11 +00:00
b31b4f29f8
Handle inconsistent error messages between Python 2 and Python 3.
2017-09-29 18:45:15 +00:00
ffa2242878
code changes brought about by discussion of pull request of 'bug_fixes' branch
2017-09-29 11:24:19 -04:00
ac97eb8bdc
Add Environment documentation (Jupyter)
...
Has errors, needs #57 .
2017-09-25 16:39:58 -04:00
b6d1bb26de
Improve utils docs, rename subpackage docs folders
2017-09-22 14:54:21 -04:00
55943847fa
updated corresponding tests that would have broke
2017-09-22 11:49:54 -04:00
94df10bf8d
docstrings redone; code changes for adding/returning STIX objects to FileSystem, Memory, TAXII; code changes for query sets and filters
2017-09-22 11:29:17 -04:00
eac1ce94de
Improve docstrings for Sphinx output
...
Also remove package and module names from classes and functions.
Also remove stix2.base from docs. We hide all private classes and
functions from the docs, so the only thing the documentation for base
included was STIXJSONEncoder.
2017-09-22 11:24:55 -04:00
c0fd740e0a
Improve autodoc output
...
- Add markings and sources
- Tidy up some docstrings
2017-09-22 10:01:00 -04:00
d7efd1f752
Set up Sphinx autodoc
...
This will automatically generate API documentation from docstrings.
2017-09-21 17:27:13 -04:00
21d978acc8
Fix errors when instantiating custom classes
...
Defining a custom object/observable/extension class with no custom
__init__() function would result in an `AttributeError` or `TypeError`,
depending on if the class sub-classed `object` or not.
2017-09-21 09:11:01 -04:00
463d1e6b28
Merge pull request #52 from oasis-open/environment
...
Environment layer
2017-09-12 13:59:08 +00:00
f00dcb682a
Fix imports
2017-09-11 13:00:40 +00:00
774acb23ea
Remove extra newline
2017-09-11 11:56:23 +00:00
190b639126
Fix memory datastore to pass tests
...
1) 'stix_data' is now optional; you can set up a MemorySink without
needing a starting set of data.
2) Removed stix2-validator calls. The validator fails when called on our
_STIXBase-derived classes because we store timestamps as datetime
objects, while the validator expects strings. Also, this was the only
datastore that used the validator, and we should be consistent across
all of them. The validator can be added back in later.
2017-09-08 12:49:08 -04:00
be07c32500
Add parse() to Environment layer
...
The Environment layer does not keep its own mapping of custom object types.
If we think it likely that users will want to maintain separate lists of
custom object types between two or more Environments, we can add this
later.
2017-09-08 12:40:01 -04:00
f60331fb77
Improve docstrings for Environment layer
2017-09-08 11:15:10 -04:00
4dfb5d2365
Test Environment layer
2017-09-08 09:01:12 -04:00
ceb88f176e
added TimestampConstant
2017-09-07 10:35:31 -04:00
95cac595da
merge in latest
2017-09-07 10:18:02 -04:00
598f38921f
Start Environment layer
2017-09-06 16:20:16 -04:00
adac43708b
Merge pull request #46 from oasis-open/markings
...
Marking Support
2017-09-05 19:08:45 +00:00
42962e6675
Improve markings tests
...
- Test markings functions with both dictionaries and our _STIXBase-derived
classes as input.
- Slightly improve test coverage.
- Drop Python 2.6 support.
2017-09-01 16:41:16 -04:00
cc66e1a492
Make markings function signatures consistent
...
Put `marking` before `selectors`. The granular marking version of
`is_marked` requires selectors to not be None.
2017-09-01 10:50:01 -04:00
6f36ea8488
Merge remote-tracking branch 'oasis/master' into datastores
2017-09-01 10:13:57 -04:00
13f2810b25
Remove name positional argument, clean memory.py redundant codeother minor changes. Increase coverage.
2017-09-01 08:15:50 -04:00
124da846c3
Merge branch 'master' into markings
2017-08-31 20:36:59 +00:00
b1054e780a
Merge remote-tracking branch 'origin/master' into datastores
2017-08-31 19:52:48 +00:00
ba846f9501
Clean up some tests.
2017-08-31 18:23:08 +00:00
7b46283a5c
Build filter function map
2017-08-31 18:21:29 +00:00
71d42b0e51
Merge remote-tracking branch 'origin/datastores' into filter
2017-08-31 17:18:20 +00:00
9d45a3dca2
Keep MALWARE_KWARGS to a minimal set
...
...but use an additional set with a description for marking tests.
2017-08-31 12:51:13 -04:00
15287959a4
Modify versioning API to work on dictionaries
...
This includes new_version() and revoke().
2017-08-31 12:28:07 -04:00
8a33cb7716
Touch up ObjectReferenceProperty checks
...
- reword "_refs" error
- check with isinstance instead of __class__.__name__
2017-08-30 16:15:05 -04:00
0e658255a8
Move check to when custom observable is defined
...
Catch properties named "_ref" or "_refs" that aren't
ObjectReferenceProperty when the custom observable is defined, not when
it is instantiated.
2017-08-30 15:33:28 -04:00
22c749d0df
filter changes
2017-08-30 11:18:11 -04:00
8ca2c3390b
Minor changes to DataSource.apply_common_filters(). Improve overall code coverage.
2017-08-29 15:15:32 -04:00
b1ac24d46e
Minor changes.
2017-08-29 15:08:26 -04:00
415c53066f
Code coverage changes, fix some tests. Add stix2-validator dependency.
2017-08-28 15:19:55 -04:00
aea076103c
Update tests to improve coverage.
2017-08-28 14:33:12 -04:00
160d69b03d
Changes to datastores.
2017-08-28 14:32:51 -04:00
07bbe23a98
Add some tests for custom objects.
2017-08-28 14:32:05 -04:00
23f36a9a69
Minor changes to custom object decorators. Add new marking decorator.
2017-08-28 14:30:53 -04:00
095c5066d5
Touch up markings tests
...
Increase code coverage and s/tlo/sdo/
2017-08-25 15:56:39 -04:00
0cd75e3fba
Increase code coverage
2017-08-24 17:53:43 -04:00
6fa3c84aa3
Improve tests and coverage for custom content
...
In ObservableProperty.clean(), parse_observable() will handle the issue
of non-cyber observable objects being presnt in an observable property.
The line raising a ValueError would not be reached so it was removed.
2017-08-24 15:46:36 -04:00
3822e39243
Remove COMMON_PROPERTIES.
2017-08-24 15:10:09 -04:00
1dfaaf15ef
Minor change. closes #29
2017-08-24 12:54:50 -04:00
dd17e88ae0
Code refactor/clean-up, changed some exceptions. Update docstrings.
2017-08-24 12:47:14 -04:00
ee49e78c72
Add custom extensions to cyber observables
...
Fix #31 .
2017-08-23 18:36:24 -04:00
8d4c1d55b5
Minor style changes.
2017-08-23 13:12:40 -04:00
f33427328b
Update tests for object and granular markings.
2017-08-23 13:07:22 -04:00
15bff530be
Refactor granular_markings.py code and remove unnecessary code in utils.py
2017-08-23 13:06:51 -04:00
f437a4df5b
Merge branch 'datastores' of github.com:oasis-open/cti-python-stix2 into datastores
2017-08-22 10:47:23 -04:00
d060abbed5
Updated regex expressions. Thanks to @drothenberg for that contribution!
2017-08-22 10:47:13 -04:00
69eb09c32b
Merge remote-tracking branch 'origin/master' into datastores
2017-08-21 22:40:07 +00:00
4cd99f04ea
Use version of taxii2-client from PyPI.
2017-08-21 22:16:23 +00:00
8687521111
Change object markings for immutable SDOs
2017-08-21 13:57:01 -04:00
d4edb8b0bc
Validate patterns when creating Indicators
2017-08-18 14:22:57 -04:00
c0d02fbfcd
[WIP] Touch up marking code
2017-08-18 12:36:34 -04:00
c64b7de761
Change query dict style for Filter namedtuple.
2017-08-18 12:05:12 -04:00
fb75de47c5
added TimestampConstant
2017-08-17 14:50:42 -04:00
14b922ba92
Merge remote-tracking branch 'emmanvg/marking-support' into markings
2017-08-17 12:26:46 -04:00
681be1a5d9
Make CompositeDataStore subclass DataStore. Remove deduplicate() from CompositeDataSource.
2017-08-16 09:58:33 -04:00
a18804a195
Add ordereddict dependency for 2.6 support. Import change in utils.py
2017-08-15 14:12:21 -04:00
15b5e107d5
Fix imports, sort requirements.
2017-08-15 13:54:16 -04:00
4ffc8edeeb
Update all tests. Re-organize EXPECTED values, update some regex expressions.
2017-08-15 13:41:51 -04:00
1b48ad9778
Changes to object serialization.
2017-08-15 13:40:47 -04:00
e3f82effc7
Apply OrderedDict changes to bundle, fix import in sdo.py
2017-08-15 08:24:43 -04:00
cb5c4ad080
Merge pull request #42 from oasis-open/bundles Parse bundles correctly
2017-08-14 15:21:58 -04:00
569ca34d78
Remove test skip for data_sources.
2017-08-14 15:02:26 -04:00
Emmanuelle Vargas-Gonzalez