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
b2ef77b322
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into stix2.1
2018-10-17 07:30:23 -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
5a0e102959
Modify docstring for apply_common_filters() to change what it
...
says are the required types for its parameters. It gave
specific types (list and set), when really it worked with more
than just that (iterables). And I certainly didn't only call
it with just lists and sets.
2018-10-15 18:02:48 -04:00
dec75082df
Add new constrains parameters to IntegerProperty and FloatProperty
...
New constraints on timestamps, integer and floats for many objects
2018-10-15 15:02:59 -04:00
acd86c80dd
Update tests to new object constraints
2018-10-15 14:48:52 -04:00
e80fb4f59a
python 3.7 support
2018-10-03 18:00:38 +02: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
cd81d97beb
added 'to_pattern()' utility for pattern expressions; more information on patterning guide
2018-08-27 16:24:23 -04:00
10149b9345
added 'to_pattern()' utility for pattern expressions; more information on patterning guide
2018-08-27 16:21:14 -04:00
a9de13107f
pattern guide
2018-08-24 10:40:37 -04:00
211b8d8cee
Add core tests and minor change to parse_observable()
2018-07-25 20:53:53 -04:00
5e71f9225b
Add regex approach to load mappings
2018-07-25 14:06:18 -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
303159a818
pre-commit hooks changes
2018-07-25 13:32:22 -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
bdfc221cb0
Update v21 properties to latest spec changes
2018-07-12 14:31:14 -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
ee260b7574
Sort import check
2018-07-11 08:38:06 -04:00
e513c8d638
Hide builder methods in 'custom.py' and update imports accordingly
2018-07-11 08:11:47 -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
834ef2c847
Fix check to collections.Mapping
2018-07-10 16:13:29 -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
8cf68054d4
Remove str() as a way to serialize objects. Add support for encodings and Bundle versions.
2018-07-10 15:51:20 -04:00
012eba4e9b
Add new Bundle support for add_objects() request. Add encoding support.
...
Removed the version from all methods since it is no longer necessary.
2018-07-10 15:49:36 -04:00
9b8cb09b1a
Remove 'version' from calls to parse since it is no longer necessary
...
Also, fixed adding STIX2 Bundles to MemorySource. Enhancements to 'save_to_file'. Fix docstrings and encoding support when writing to file. closes #202
2018-07-10 15:43:58 -04:00
b6fefc52d9
Fix call to collect STIX2 mappings, make parse_observable available
2018-07-10 15:31:22 -04:00
8d378fcf81
Remove STIXRelationshipObject from 'sro.py'
2018-07-10 15:27:05 -04:00
023603d86f
Remove duplicate code from 'sdo.py', removed STIXDomainObject
...
Apply proper 'spec_version' constraints to v21 objects
2018-07-10 15:22:21 -04:00
54268ae7dd
Remove observables and extension mappings, custom code and apply property constrain in v21
2018-07-10 15:20:16 -04:00
1177694739
Adding docstrings to 2.1 objects
2018-07-10 15:15:33 -04:00
b722fdc0ed
Remove duplicate register methods and CustomMarking code
2018-07-10 15:07:08 -04:00
5332d54383
Refactor Bundle
...
Removed redundant STIXObjectProperty, for 2.1 use validation specific to that version
2018-07-10 15:02:55 -04:00
78d77254ae
Add object mappings in the top of each version package
2018-07-10 14:59:43 -04:00
03e19f197c
Moved STIXDomainObject and STIXRelationshipObject here, the observable
...
parsing code, minor changes to the mappings collections and all _register methods
2018-07-10 14:56:31 -04:00
b76888c682
Add a new 'custom.py' module to store and consolidate all custom code
2018-07-10 14:54:17 -04:00
f669656a4d
Removed 'ExtensionsProperty' from workbench.
2018-07-10 14:52:10 -04:00
7da6f1ed88
Add a package-wide 'properties.py'
...
Consolidated STIXObjectProperty, ExtensionsProperty, ObservableProperty code. Also added a 'spec_version' to allow validation changes per spec.
2018-07-10 14:50:03 -04:00
fe64fb044f
Removed per version 'properties.py'
2018-07-10 14:47:30 -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
8aeac369f4
Returning double quotes here... went overboard.
2018-07-09 14:59:19 -04:00
21d5451d1c
Small changes to tests
2018-07-06 14:11:59 -04:00
52c1850655
Small addition to patterns.py
2018-07-06 14:08:49 -04:00
68aac583c9
Merge pull request #204 from oasis-open/refactor-properties
...
Refactor Properties
2018-07-05 17:16:25 -05: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
7c8113a4d9
Merge pull request #201 from oasis-open/188-uuidv4
...
Ensure all UUIDs are V4
2018-07-05 11:46:44 -05:00
12a22c0939
Remove unnecessary code related to defining properties.
2018-07-05 11:39:44 -05: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
2e6bb74be8
Add spec version 2.1 to object missing the property.
2018-06-29 18:48:41 -04:00
7fd379d0b5
Minor style changes.
...
Removed OrderedDict and update()... Also a lot of single quoting except for errors
2018-06-29 18:38:04 -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
9baaad6e08
Sort imports.
2018-06-26 12:23:53 -04:00
bee537137b
Update base.py
...
Fix STIXJSONIncludeOptionalDefaultsEncoder call to super()
2018-06-26 11:10:36 -04:00
5cbe886cdb
split properties out by spec version
2018-06-26 09:32:24 +00:00
d44c2abd0f
2.1 spec (somewhat inexplicably) limits dict keys to 250 chars
2018-06-26 09:23:52 +00:00
cc58a3a4f4
2.1 removes 3 char limit on dict keys
2018-06-26 09:22:57 +00:00
6b1da856dd
split properties out by spec version
2018-06-26 09:22:04 +00:00
b852b91652
Reformat methods documentation
2018-06-25 10:06:07 -04:00
0ddb7b3807
Update observables.RasterImageExt 'image_weight' property to 'image_width'
2018-06-25 08:55:12 -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
240a75861e
Updated stix2.parse()-related docstrings. Its description of how
...
the "version" parameter was used, was out of date.
2018-06-14 15:56:02 -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
f211649529
Made some minimal changes to support the STIX 2.1 Malware SDO,
...
and the maec2stix tool.
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
c12336b55a
Revert changes to iterables.
2018-06-12 15:03:25 -04:00
78a480aa08
Change str.isdecimal to isdigit. On lists keep iterating if unless index is found
2018-06-12 14:45:15 -04: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
75e478312a
Additional changes to match updates in v20 code.
2018-06-11 13:37:45 -05:00
91cae0b5b7
Split `find_property_index` and support multiple levels of nesting.
2018-06-08 15:43:21 -04:00
60da259805
Add an example on how to call the serialize() method.
2018-06-08 15:42:59 -04:00
5a9f627669
Pickle-proof stix objects
2018-06-06 15:30:45 -04:00
dbe9c3f087
fix custom STIX objects with nested dictionary error #184
2018-06-01 13:49:32 +01: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
3fb1840289
safer error class
2018-05-22 10:03:06 -04:00
636630a5aa
Bump version: 1.0.1 → 1.0.2
2018-05-18 13:06:32 -04: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
102623b29a
Bump version: 1.0.0 → 1.0.1
2018-04-27 16:51:47 -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
fb79e703b8
Simplify FilterSet instance in MemorySource
2018-04-23 14:12:16 -04:00
8a9acfe487
Create TAXII query correctly. closes #169
2018-04-23 14:11:08 -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
161e10ec40
Bump version: 0.5.1 → 1.0.0
2018-04-16 14:57:35 -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
194672ee2b
Tweak FilterSet docstrings style
2018-04-13 17:11: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
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
Emmanuelle Vargas-Gonzalez