7c96d991e6
Added a function to ensure precision consistency
2019-09-11 10:55:09 -04:00
9c7128d074
Fix indentation issue
2019-09-11 10:49:11 -04:00
d828e41c78
End of changes
2019-09-11 10:44:14 -04:00
6fa77adfe3
wrote all default weights, actually computing the equivalence score
...
logging for unsupported objects, finished implementing some methods. Missing to implement patterning.
2019-09-10 15:04:07 -04:00
53db47b447
Statement-type definitions will now match the timestamp precision given to them
2019-09-09 21:38:58 -04:00
5b6592e2dc
Some changes. More fixes coming soon, hopefully
2019-09-06 18:08:27 -04:00
8f773fd556
Temp backup of some code changes. More coming soon
2019-09-06 00:25:42 -04:00
abf2980336
Fix tests and ReferenceProperty
2019-09-04 19:08:34 -04:00
44ebd64a16
Some test fixes. More coming soon
2019-08-30 03:47:47 -04:00
f69b13a006
Some more updates, primarily to ReferenceProperty (and related code)
2019-08-29 17:15:51 -04:00
5825118ad4
Merge branch 'stix2.1' of https://github.com/oasis-open/cti-python-stix2 into wd05SCO
2019-08-27 17:37:14 -04:00
49077352d7
Updates and corrections for SCO WD 05 updates. Temp backup; testing and more fixes coming soon
2019-08-27 17:36:45 -04:00
94bb76f669
Fix docstring on the unit tests I added. I'd said "partially
...
cleaned" property, but actually, the cleaning algorithm works on
a dict copy, so aborting cleaning partway through doesn't
actually affect the object in that way. It would actually cause
the extensions property to be completely uncleaned, rather than
partially cleaned.
2019-08-26 17:49:55 -04:00
c212c7c678
Fix handling of custom extensions: make sure when
...
allow_custom=True that you never get a half-cleaned property
value.
2019-08-26 17:10:54 -04:00
7c9fc3fd08
Fix deterministic ID tests
2019-08-21 09:33:42 -04:00
364daec40a
Add deterministic ID tests
2019-08-21 09:21:51 -04:00
5e9d6a6a14
Fix small indentation error
2019-08-21 08:49:33 -04:00
bf1b8b567d
Updates to allow existing tests to pass
2019-08-21 02:00:41 -04:00
46359ead69
Modify a few things
2019-08-19 13:35:17 -04:00
ec55463398
Update SCO stuff to WD 05
2019-08-19 09:39:13 -04:00
b0a1bbbc84
Bump version: 1.1.2 → 1.1.3
2019-08-12 13:32:47 -04:00
dee2f1f60c
Merge branch 'stix2.1' of https://github.com/oasis-open/cti-python-stix2 into wd05SCO
2019-08-12 08:16:00 -04:00
b981cdf4fc
Fix tests
...
by removing certain human message assertions from test suites.
(These changes are cherry-picked from commit by @khdesai on a different
branch)
2019-08-09 16:04:29 -04:00
5e5a03c001
Changed emitted deprecation warnings to a custom DeprecationWarning
...
subclass. Changed the unit test to test for that specific
warning category, instead of any DeprecationWarning.
2019-08-07 10:16:18 -04:00
27beec4060
Add a deprecation warning for the "objects" property of
...
observed-data. Add a unit test to ensure we get the warning.
2019-07-29 16:35:38 -04:00
93aa709b68
write down some of the semantic-equivalence work. WIP
2019-07-26 16:01:45 -04:00
9404cf4560
Fix flake8 style error.
2019-07-25 16:58:48 -04:00
423487d65a
Add a unit test for the first/last_seen value co-constraint
...
on ThreatActor.
2019-07-25 16:57:15 -04:00
8362d80206
Change "object_modified" property of LocationContent to be
...
optional. Add a corresponding unit test.
2019-07-25 16:56:34 -04:00
5649559c6d
Removed some more hard-codings of v20 in the workbench test
...
suite.
2019-07-24 17:39:00 -04:00
b0eb518997
Added adaptability to the workbench module, regarding the
...
autogenerated docstrings: v20/v21 is automatically referenced as
appropriate, based on stix2.DEFAULT_VERSION. To avoid
duplication, I also moved _STIX_VID from test_workbench.py to
workbench.py; the former now imports it from the latter.
2019-07-24 17:20:52 -04:00
22face6c1a
Add trailing commas to satisfy pre-commit hooks...
2019-07-24 16:30:18 -04:00
9d08cadcfd
Turn off the workbench test suite's side effects after each test
...
that turns them on. These have the potential to affect subsequent
tests. The side effects include automatically setting
property values, and automatically appending additional values
to list-valued properties.
2019-07-24 16:23:19 -04:00
38103ac6c5
Moved test/v20/test_workbench.py up one directory level since
...
it doesn't make sense to have a test per STIX version. The
workbench only uses the latest supported STIX version. In
order to make this work, the test suite was modified to
dynamically compute some settings like where to get demo data,
based on the value of stix2.DEFAULT_VERSION.
Switched stix2.DEFAULT_VERSION back to "2.0", since I figure it
should be sync'd up with the 'from .vxx import *' import
statement from the top level package.
2019-07-24 15:35:59 -04:00
d69449706f
Revert the docstrings generated for the workbench dynamically
...
created subclasses, to mention v20 instead of v21.
2019-07-22 17:01:52 -04:00
165d87e103
Revert the import in the top-level stix2 package, to v20. This
...
additionally required:
- Removing the v21 workbench test suite and reinstating the v20
test suite
- Fixing up a few v20 unit tests to work with the workbench
monkeypatching.
- I didn't revert the analogous changes I'd previously made to
the v21 unit tests, because I think they make sense even when
the workbench monkeypatching isn't happening.
2019-07-22 16:55:22 -04:00
227383cdcb
Removed _observed_data_init() from workbench.py, part of the old
...
monkeypatching algorithm. It's no longer needed and I forgot to
delete it.
2019-07-19 15:58:15 -04:00
823b67a4fc
Add a few more tests to exercise more complex property presence
...
constraint checking.
2019-07-19 15:40:03 -04:00
5589480980
Improved the exception class hierarchy:
...
- Removed all plain python base classes (e.g. ValueError, TypeError)
- Renamed InvalidPropertyConfigurationError -> PropertyPresenceError,
since incorrect values could be considered a property config error, and
I really just wanted this class to apply to presence (co-)constraint
violations.
- Added ObjectConfigurationError as a superclass of InvalidValueError,
PropertyPresenceError, and any other exception that could be raised
during _STIXBase object init, which is when the spec compliance
checks happen. This class is intended to represent general spec
violations.
- Did some class reordering in exceptions.py, so all the
ObjectConfigurationError subclasses were together.
Changed how property "cleaning" errors were handled:
- Previous docs said they should all be ValueErrors, but that would require
extra exception check-and-replace complexity in the property
implementations, so that requirement is removed. Doc is changed to just
say that cleaning problems should cause exceptions to be raised.
_STIXBase._check_property() now handles most exception types, not just
ValueError.
- Decided to try chaining the original clean error to the InvalidValueError,
in case the extra diagnostics would be helpful in the future. This is
done via 'six' adapter function and only works on python3.
- A small amount of testing was removed, since it was looking at custom
exception properties which became unavailable once the exception was
replaced with InvalidValueError.
Did another pass through unit tests to fix breakage caused by the changed
exception class hierarchy.
Removed unnecessary observable extension handling code from
parse_observable(), since it was all duplicated in ExtensionsProperty.
The redundant code in parse_observable() had different exception behavior
than ExtensionsProperty, which makes the API inconsistent and unit tests
more complicated. (Problems in ExtensionsProperty get replaced with
InvalidValueError, but extensions problems handled directly in
parse_observable() don't get the same replacement, and so the exception
type is different.)
Redid the workbench monkeypatching. The old way was impossible to make
work, and had caused ugly ripple effect hackage in other parts of the
codebase. Now, it replaces the global object maps with factory functions
which behave the same way when called, as real classes. Had to fix up a
few unit tests to get them all passing with this monkeypatching in place.
Also remove all the xfail markings in the workbench test suite, since all
tests now pass.
Since workbench monkeypatching isn't currently affecting any unit tests,
tox.ini was simplified to remove the special-casing for running the
workbench tests.
Removed the v20 workbench test suite, since the workbench currently only
works with the latest stix object version.
2019-07-19 14:50:11 -04:00
4660d5ea28
Update SCO specs per WD 05 specs
2019-07-17 15:48:09 -04:00
cd0c4984fa
Fix most unit tests to pass again. Awaiting feedback regarding
...
possible library bugs, before I fix the remaining unit tests.
2019-07-16 16:10:25 -04:00
1b7abaf228
WIP: updating objects to be compliant with stix2.1 WD05. This
...
includes SDO/SRO class updates, but no unit test updates. The
class updates broke unit tests, so that still needs to be
addressed.
2019-07-14 15:34:31 -04:00
b464a9cc0a
Remove certain human message assertions from test suites
2019-07-09 13:34:19 -04:00
ae35d2ab01
Add and update tests to conform code to WD04 SDO specs
2019-07-02 13:17:43 -04:00
ffbf5fa34c
Fix JSON encoding issue within tests
2019-07-01 15:41:44 -04:00
c98fcafb1a
Update tests to address conformance to WD04 specs
2019-07-01 15:26:30 -04:00
ef408e1971
preliminary changes to make stix2 code conform to WD 04 specs
2019-07-01 11:52:55 -04:00
953a91ba8e
Merge pull request #273 from chisholm/update_course_of_action
...
Update course of action for stix2.1 (again)
2019-06-28 12:32:14 -04:00
266516ebbc
Merge pull request #272 from chisholm/malware_analysis
...
Add stix2.1 malware-analysis SDO
2019-06-28 09:57:47 -04:00
6aff018695
fix: Avoid issues with custom objects
...
- Custom objects type is dict, which makes it fail
when the attribute 'id' is called
2019-06-27 17:19:05 +02:00
e779cacf3e
Update course of action tests, to include tests with the
...
action_reference property. Also, stylistic changes to hopefully
let it do more testing with less code.
2019-06-26 21:01:41 -04:00
de93a2ee32
Fix stix2.1 course-of-action SDO class properties action_reference
...
and action_bin to have the correct types.
2019-06-26 19:54:28 -04:00
c6132537b8
Changes from add-trailing-comma hook
2019-06-26 17:17:16 -04:00
68f93f4110
Oops, forgot to add the malware-analysis test suite...
2019-06-26 17:10:04 -04:00
5c92db9861
Add stix2.1 malware-analysis SDO
2019-06-26 17:06:26 -04:00
b8c5bec101
Merge branch 'master' into stix2.1
2019-06-26 12:22:40 -04:00
28ac284b84
Remove unnecessary ObservedData constraint
...
first_observed and last_observed are both required, so this co-constraint was removed from WD04.
2019-06-26 11:18:47 -04:00
58ff89f112
Update observed-data SDO class, adding the new stix2.1 property
...
"object_refs". Added a couple tests for it.
2019-06-21 15:44:04 -04:00
23d5bef2ec
Change all uses of multi-STIX-version properties (i.e. those
...
with a spec_version constructor argument) in STIX-version-specific
contexts, to explicitly specify the STIX version.
2019-06-21 14:29:08 -04:00
9cc1e6e8c1
Change location of DEFAULT_VERSION definition, to be before
...
the imports. This ensures the attribute will be defined even if
there are import loops.
2019-06-21 14:26:48 -04:00
8bb6c79f1d
Change import order to satisfy style checkers...
2019-06-21 14:25:36 -04:00
f9578313a0
Change stix2.DEFAULT_VERSION to "2.1" on the stix2.1 branch.
2019-06-21 13:20:37 -04:00
ea98a53fae
Change all hard-coded spec_version defaults in property classes
...
to stix2.DEFAULT_VERSION.
2019-06-21 13:18:51 -04:00
d61b543266
Style changes to satisfy the 'style' tox check
2019-06-14 18:10:38 -04:00
a150b0f4aa
Change all uses of IDProperty and ReferenceProperty to specify
...
a particular spec_version.
2019-06-14 17:58:51 -04:00
da5978d317
Factored out more of the STIX identifier validity checking,
...
partly inspired by PR #263 . This resulted in some error message
format changes (an improvement, I think), which caused some
unit test breakage. Removed those asserts from the unit tests,
since tests shouldn't be testing human-targeted error messages.
2019-06-13 18:37:21 -04:00
ed106f23ff
Update IDProperty and ReferenceProperty to support both stix 2.0
...
and 2.1 rules regarding identifiers. Change relevant property
tests to specify which spec version to use, and modify tests
according to the specs.
2019-06-12 20:19:47 -04:00
4f593e6d16
Changes from the add-trailing-comma pre-commit hook
2019-06-12 14:49:34 -04:00
caa1d45ae2
Update stix2.1 course-of-action support to the latest spec.
2019-06-11 18:10:02 -04:00
a6fa3ff1d7
Slightly change bundle error message
2019-05-22 11:05:01 -04:00
ce86db2a12
Fixes #257
2019-05-20 15:36:35 -05:00
86790a736f
Fixes #257
2019-05-20 15:29:01 -05:00
45d3020518
Fixes #257
2019-05-17 14:21:35 -05:00
a61344a8aa
Add get_obj function to bundle.py to make accessing bundles easier
2019-05-14 13:48:54 -04:00
1bf12221a0
Update _valid_refs doc and add test to v20 test suite
2019-05-13 09:18:50 -04:00
f79b3c9876
Add functionality to _valid_refs to accept actual cyber observable objects instead of just strings with their types
2019-05-10 10:22:45 -04:00
087ac35f38
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into 252-TLPMarking-constraints
2019-05-08 10:43:13 -04:00
00d99e3815
remove unused imports
2019-05-08 10:38:23 -04:00
9c34e2f8ca
update tests to make sure we are testing the serialized instance correctly
2019-05-08 10:36:31 -04:00
d5f0c46dd5
re-organize imports in v20, v21
2019-05-08 10:35:53 -04:00
47f8ed9282
move check_tlp_marking to markings\utils.py
2019-05-08 10:34:56 -04:00
582ba2be2c
Merge pull request #259 from emmanvg/251-lang-markings-support
...
Language markings support
2019-05-08 09:48:21 -04:00
4b21708e03
modify test to cover exception message
2019-05-03 11:05:32 -04:00
b3a601e4c8
add new files for marking-definition tests
2019-05-03 10:25:11 -04:00
d6497f66fe
create a new exception for TLP validation and util method
2019-05-03 10:03:15 -04:00
46c47a0d08
new approach towards validation of tlp instances
2019-05-03 09:59:07 -04:00
fff0e9e731
update test_datastore_filesystem.py to create proper tlp markings
2019-05-03 09:58:45 -04:00
c3aecd76ba
update unnecesary property clean-up and add tests
2019-04-23 09:27:21 -04:00
f8857569d5
Add header to test file
2019-04-23 07:48:51 -04:00
dbc63b7b9f
pre-commit changes
2019-04-23 07:43:56 -04:00
0c78acafd0
add tests to cover the language aspect of the markings
2019-04-22 15:26:21 -04:00
4bbabaecb2
update marking API methods to allow/use the 'lang' property
...
including utility methods that expand collapse markings
2019-04-22 15:25:46 -04:00
84fc71add4
Add test to ensure fix. Fixes #248
2019-04-19 12:17:42 -04:00
e748923f19
Fixes #248
2019-04-17 10:08:34 -04:00
f8d4669f80
Bump version: 1.1.1 → 1.1.2
2019-02-13 10:37:38 -05:00
afe57f642d
Add docstring for to_maps_url()
2019-02-08 14:41:54 -05:00
e976f0a926
Trim location tests
...
We can rely on defaults for some properties we aren't testing.
2019-02-08 14:17:19 -05:00
edfe0ba51a
Add support for Bing Maps and corresponding tests. Fixes #86
2019-02-08 09:37:27 -05:00
516789400b
Merge branch 'master' of https://github.com/khdesai/cti-python-stix2 into location_issue_86
2019-02-07 10:37:37 -05:00
8be704a5b9
Update to_map_url and add tests. Fixes #86
2019-02-07 10:31:51 -05:00
dc91c9cbf4
Initial fix for issue 86. Fixes #86
2019-02-06 16:16:50 -05:00
69d2529f0e
Fix style issues
2019-02-06 15:23:00 -05:00
1c03b4a1f0
minor grammar fix
2019-02-04 13:58:33 -08:00
a788dbb64c
Replace most SDO/SRO values in tests with IDs from constants.py
2019-01-29 10:52:59 -05:00
10bfde0e86
Merge branch 'master' of https://github.com/khdesai/cti-python-stix2 into fix_issue_245
2019-01-29 08:31:47 -05:00
b4d4a582ce
Update timestamps in v20 testsuite JSON files
2019-01-23 13:42:25 -05:00
cdac66c04d
Update v21 test suite. Fixes #245
2019-01-23 10:56:20 -05:00
9941014f3a
Update v20 test suite to fix issue 245
2019-01-22 23:07:20 -05:00
5fb69e1d44
Start updating test suites to fix issue 245
2019-01-22 21:25:09 -05:00
59ec498fa0
Fix test cases in v20
2019-01-22 12:55:19 -05:00
f59db77352
Update v21 tests and add them to v20 test suite
2019-01-22 12:42:47 -05:00
dda8a7f724
Add two tests to ensure millisecond precision is used in timestamps irrespective of user-provided precision
2019-01-22 10:05:22 -05:00
5658cebf57
Update JSON files so timestamps are only precise to the millisecond (3 decimal points), per the specs
2019-01-18 13:28:37 -05:00
7e64c70d8b
Bump version: 1.1.0 → 1.1.1
2019-01-11 14:27:35 -05:00
db5f8f2ebf
Update docstrings to relocate links\documentation
2019-01-11 13:55:05 -05:00
e1356437fc
Merge pull request #240 from khdesai/fix_issue_232
...
Fix issue 232, raise DataSourceError when FileSystemStore attempts to overwrite an existing file
2019-01-11 11:10:42 -05:00
72d7757c7b
Change test to use store instead of source & sink
2019-01-11 10:46:16 -05:00
5dea09547e
Fix test for fix to issue 232
2019-01-11 09:40:57 -05:00
6e28cc8fe6
Add test to fix for issue 232
2019-01-11 09:26:55 -05:00
767a758b28
Fix styling issue around imports for issue 232
2019-01-09 11:32:51 -05:00
8c3ecd1c48
Merge pull request #237 from oasis-open/236-WindowsRegistryKey
...
Fix error when printing WindowsRegistryKey
2019-01-09 11:12:46 -05:00
1ad64dfc0c
Move CallableValues to prevent duplicate code
2019-01-09 10:46:48 -05:00
77b2e0e3e3
Remove a few comments and Fixes #232
2019-01-09 10:22:33 -05:00
7883614d2f
Fixes #232
2019-01-09 08:36:10 -05:00
26a658b789
Update test to v21
2019-01-08 09:41:53 -05:00
67d3970a50
Update test_observed_data.py
...
Change to correct version
2019-01-08 09:35:01 -05:00
ab687d8d0e
Test empty extension property serialization
2019-01-07 15:22:08 -05:00
2966efa4f0
Remove dictionary/extension property non-empty req
...
Only bundle.objects and observed-data.objects have a requirement to
include at least one item.
2019-01-07 11:15:47 -05:00
34002c4f7c
Fix error when printing WindowsRegistryKey
...
Caused by WindowsRegistryKey having a 'values' property. Fixes #236 .
2018-12-21 14:33:59 -05:00
06e23b08b8
Bump version: 1.0.4 → 1.1.0
2018-12-11 14:14:49 -05:00
6e50bf5123
Formatting problems...
2018-12-11 13:48:56 -05:00
c8c48a305a
Add future import to resolve compatibility problems
2018-12-11 13:41:19 -05:00
7d84c63e8e
pre-commit formatting changes
2018-12-11 13:23:43 -05:00
f12cc82d8a
incorporate feedback
...
update documentation for core.py and automatic copyright year for docs
2018-12-11 13:22:04 -05:00
3f02925fc9
add new pattern_expressions tests to proper locations
2018-12-11 13:07:53 -05:00
ff098a19b1
update method _timestamp2filename() since it introduces timing precision problems
2018-12-11 13:06:51 -05:00
c75a0857ec
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into 1.1.0-release
2018-12-11 13:03:42 -05:00
f20ee91544
rename 'STIXPatternVisitor' to 'pattern_visitor'
2018-12-10 15:23:26 -05:00
9a69823d08
Revert unnecessary changes
2018-12-10 15:08:43 -05:00
7702d435ba
update method to use docstrings
2018-12-10 15:07:38 -05:00
50a2191805
Favor star import, disable messages for undefined methods F405
2018-12-10 14:44:44 -05:00
fc0069ed60
re-order imports, add entry to isort file
2018-12-10 14:29:31 -05:00
b3f69bf942
imports again
2018-12-10 13:42:05 -05:00
fcea810ea1
added test for ListConstant
2018-12-10 12:54:58 -05:00
7bd330dfae
import experiment 3
2018-12-10 12:25:59 -05:00
1bb3aa12f0
import experiment 2
2018-12-10 12:16:39 -05:00
05964ee0c7
import experiment
2018-12-10 12:14:31 -05:00
a5eca9916c
last flake-y
2018-12-09 21:48:24 -05:00
99276c92fc
flake-y again
2018-12-09 21:42:24 -05:00
f3526bbfa6
flakey5
2018-12-07 14:06:36 -05:00
55ac3564bd
flakey4
2018-12-07 14:03:46 -05:00
52c7d2a722
flakey3
2018-12-07 13:59:57 -05:00
3ea8035fcb
flakey2
2018-12-07 13:47:44 -05:00
da4a91a3ca
flakey
2018-12-07 13:30:05 -05:00
03cceb827d
add_visitor - take 2
2018-12-07 12:43:23 -05:00
96b81fc489
pre-commit formatting changes
2018-12-06 15:19:50 -05:00
01df0ccc57
Add new files for the test/v2X/stix2_data/ directory
2018-12-06 15:18:25 -05:00
bfa49ce37a
Removed everything in test/v21/stix2_data/
...
Bring back optional version parameter to datastores. Update
documentation. Update v21 test suite
2018-12-06 15:11:30 -05:00
3d099bec91
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into 1.1.0-release
2018-12-06 15:08:36 -05:00
e1f7cc4028
change "Notes" for "Note" to keep visual effect in documentation
2018-11-30 09:39:05 -05:00
f76de87f59
Update test_datastore_taxii.py
...
return the right bundle...
2018-11-29 18:45:34 -05:00
c62b9e92e7
revamp code in MockTAXIICollectionEndpoint, add more tests
2018-11-29 18:36:37 -05:00
06716e3cfd
remove redundant/unreachable code in core, add tests
2018-11-29 14:41:57 -05:00
aa649d4727
more pre-commit changes
2018-11-29 13:50:05 -05:00
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
6f897bc91d
small enhancements, fix property for TLPMarking
2018-11-29 10:26:20 -05:00
79c9d85072
make Memory datastore return path where data was saved to
2018-11-29 10:25:15 -05:00
682e90ccaa
expose the confidence methods via `stix2.scales.<method>`
2018-11-28 17:17:05 -05:00
e896812754
minor code changes
2018-11-28 16:51:35 -05:00
71a2aa2611
update project documentation.
2018-11-28 16:51:00 -05:00
97a21c3064
my precious tables gone :(
2018-11-28 15:34:48 -05:00
c3031a0282
fix typo on DNI scale
2018-11-28 11:28:26 -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
3a2f247f68
Fixed my own brainfart with converting string filter values to
...
datetimes: I'd converted the object property instead of the
filter value! :-P
Also, I fixed filter validation: it was checking for exact types
of the filter values and disallowing subtypes. This library
includes a datetime subtype named STIXdatetime, and this type
should be usable as a filter value too. So we need to allow
subtypes.
2018-11-27 18:38:55 -05:00
f57b9c34ef
Add a newline to the end of a file
2018-11-27 17:58:01 -05:00
18ff6f6094
Import cleanup to satisfy tox checks
2018-11-27 17:52:38 -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
63166ab256
Add some backward-compatibility to filesystem store: versioned
...
objects are searched for as ID-named json files in the type
directories, in addition to timestamp-named files in ID
directories.
Made a bugfix: fixed improper exception re-raises
Made an efficiency improvement: don't stat() files in
_get_matching_dir_entries() if no st_mode_test callable is given.
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
da13882eec
Fix FileSystemSource.get() to not look for the latest version of
...
an object when markings are queried, since markings are not
versioned.
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
2b983368e5
Fix an indexing error which caused FileSystemSource.get() to return
...
the oldest object instead of the newest.
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
461e8bd5cb
Removed the old FileSystemSource.query method. I'd renamed it
...
"query2" and forgot about it and left it there...
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
d01e6b47af
Bump version: 1.0.3 → 1.0.4
2018-11-15 11:10:50 -05:00
51df054f33
Update memory.py
2018-11-14 15:16:49 -05:00
d6435a18fa
Missing changes to key/value approach
2018-11-14 15:03:57 -05:00
c80f39ceed
Change approach to allow for custom objects
2018-11-14 14:35:22 -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
7bb3d1f6a6
Fix FileSystemSource.get() to not look for the latest version of
...
an object when markings are queried, since markings are not
versioned.
2018-11-06 16:06:26 -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
e2f5d60b51
Fix an indexing error which caused FileSystemSource.get() to return
...
the oldest object instead of the newest.
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
51668a9a04
Removed the old FileSystemSource.query method. I'd renamed it
...
"query2" and forgot about it and left it there...
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
8d24015186
Update Memory datastore to allow for mapping objects
2018-11-01 10:54:58 -04:00
5abe518b8a
Bump version: 1.0.3 → 1.1.0
2018-11-01 09:55:37 -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
f85f4e566b
Bump version: 1.0.2 → 1.0.3
2018-10-31 13:46:47 -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
6613b55a43
Update MemoryStore documentation
...
...now that MemorySource normalizes its data to python-stix2 objects.
2018-10-23 14:29:56 -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
2d89cfb0cf
Remove outdated TODO's from the memory datastore module-level
...
docstring.
2018-10-17 15:49:58 -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
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
Zach Rush