203a2746e0
add new file test_extension_definition.py and assigned new UUIDs to the constants
2021-03-31 15:00:54 -04:00
35ef718b70
add extension-definition ids (fail to validate) but keeping in Git history
2021-03-31 14:58:28 -04:00
dd6b847b10
small tweaks and pre-commit changes
2021-03-31 12:44:15 -04:00
6d285c47ae
update test suite for use of .serialize(pretty=True)
2021-03-31 12:39:14 -04:00
9cc2e5bd3a
remove backwards compatible imports, remove pretty=True from _STIXBase.__str()__, and simplify _STIXBase.__repr()__ (breaking)
2021-03-31 11:02:05 -04:00
bde9aaa13e
update some TODOs and clear out some backwards kept imports (breaking)
2021-03-30 22:40:41 -04:00
8093e07d1b
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into main
2021-03-24 12:36:49 +01:00
2743b90fc0
Merge pull request #500 from emmanvg/add-fp-serialize
...
fp write for STIX Objects
2021-03-19 21:13:30 -04:00
19196654c5
Apply suggestions from code review
...
Co-authored-by: Chris Lenk <clenk@users.noreply.github.com>
2021-03-19 15:31:01 -04:00
c2d360d223
apply fp_serialize() changes on main serialize() method
2021-03-18 18:08:31 -04:00
922de111ed
minor tweaks to docstrings
2021-03-18 10:14:36 -04:00
2ea9c0c63c
use it on filesystem.py data sink
2021-03-17 15:15:26 -04:00
827f622c04
provide ability to stream STIX output to fp ``.write()`` file-like object
2021-03-17 15:01:49 -04:00
69cd079cc2
Merge pull request #499 from oasis-open/emmanvg-patch-1
...
Update incident weights for semantic similarity
2021-03-15 09:35:21 -04:00
ccf3b1a0fc
Merge pull request #480 from emmanvg/479-pagination-taxii-datastore
...
Support Pagination in TAXII DataStore
2021-03-15 09:33:42 -04:00
f7ebd34c8c
Update __init__.py
...
fix incident entry
2021-03-12 16:49:23 -05:00
7e5d31742c
remove `six` from tests
2021-03-12 16:46:34 -05:00
c9e66def60
rename test, update the rest of the docstrings for object_similarity() and object_equivalence()
2021-03-10 13:32:02 -05:00
7d7c56c64b
Update stix2/environment.py
2021-03-10 09:52:24 -05:00
262284444e
Update stix2/environment.py
...
Co-authored-by: Chris Lenk <clenk@users.noreply.github.com>
2021-03-10 09:52:15 -05:00
fb6852b38f
update test suite
2021-03-01 20:47:30 -05:00
bd996b8750
Update __init__.py
2021-03-01 14:40:05 -05:00
72a12e96ba
update guide example, conf.py and remove some unused imports
2021-03-01 13:14:03 -05:00
e4e6f46089
change key name for _refs check
2021-03-01 12:54:01 -05:00
3efa4c1ce9
revert part changes
2021-03-01 12:44:35 -05:00
d2e867b52e
docstring corrections
2021-03-01 12:29:33 -05:00
ff5014c606
expose configuration options, combine weight dictionary, update tests
2021-03-01 12:27:52 -05:00
f9a52eeed3
WIP: changes to both similarity functions, expose settings
2021-02-26 19:19:33 -05:00
b3d0c7b58a
styling changes
2021-02-20 00:13:36 -05:00
e4039231f4
missing link and test case
2021-02-20 00:10:38 -05:00
d5e6226c82
update hyperlinks to STIX 2.1 CS 02
2021-02-19 23:27:41 -05:00
479cff818a
few leftover changes...
2021-02-19 22:15:11 -05:00
9043a9dc8e
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into dev-extensions-proposal
2021-02-19 21:54:46 -05:00
5067a3ff76
couple of changes after merging against master
2021-02-19 10:05:56 -05:00
4bccfd26bd
Merge pull request #492 from oasis-open/drop-six
...
Drop 'six' dependency (backwards breaking)
2021-02-18 23:45:13 -05:00
64608e7bea
Merge pull request #491 from emmanvg/graph-eq-changes
...
Graph Equivalence Changes
2021-02-18 23:44:39 -05:00
a8b6fa2100
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into dev-extensions-proposal
2021-02-18 16:04:30 -05:00
b4a0a9ea10
Remove six dependency (backwards breaking)
...
We've already removed Python 2 from our test harness, but this removes
all python 2 compatibility code left in.
2021-02-18 12:38:35 -05:00
490251dd85
Revert JSON canonicalization code
...
Undo our Python 2 compatibility fixes
2021-02-18 12:21:52 -05:00
99453770cf
doctring changes, _versioned_checks changes
2021-02-18 10:37:34 -05:00
fa6978969b
removing unused imports (backwards breaking)
2021-02-18 10:20:42 -05:00
010593345c
Update stix2/environment.py
...
docstrings
Co-authored-by: Chris Lenk <clenk@users.noreply.github.com>
2021-02-18 09:16:19 -05:00
75b411df85
Update stix2/environment.py
...
docstrings
Co-authored-by: Chris Lenk <clenk@users.noreply.github.com>
2021-02-18 09:15:26 -05:00
75574c9427
Update stix2/equivalence/object/__init__.py
...
docstrings
Co-authored-by: Chris Lenk <clenk@users.noreply.github.com>
2021-02-18 09:15:09 -05:00
34feac6ae7
Update stix2/environment.py
...
Co-authored-by: Chris Lenk <clenk@users.noreply.github.com>
2021-02-18 09:14:47 -05:00
154fc4e236
Update stix2/equivalence/object/__init__.py
...
update variable names
Co-authored-by: Chris Lenk <clenk@users.noreply.github.com>
2021-02-18 09:14:34 -05:00
52c5f3ad29
Update stix2/equivalence/object/__init__.py
...
Co-authored-by: Chris Lenk <clenk@users.noreply.github.com>
2021-02-18 09:14:10 -05:00
702c80bd53
add styling changes
2021-02-17 21:47:56 -05:00
ee63e9faf4
resolve issue regarding reference_check or list_reference_check, remove redundant object_similarity call
...
update test suite
2021-02-17 21:30:14 -05:00
c656d35da5
add more test coverage for new functions
2021-02-16 13:40:42 -05:00
d2d85badb2
make some functions internal, add some docs for them
2021-02-16 11:01:07 -05:00
09fd8c060b
clear debug message
2021-02-16 10:23:02 -05:00
fbea229004
add styling changes
2021-02-16 09:44:03 -05:00
ef610ec8d3
small docstring fix
2021-02-16 09:36:09 -05:00
f966c64b40
update test suite for environments
2021-02-16 01:05:46 -05:00
690a515f00
add methods to environment.py
2021-02-16 00:58:33 -05:00
02b076b3bb
resolve issues with graph similarity
...
- new methods for graph equivalence and similarity
- remove sorting and len comparisons
- rename some variables
2021-02-16 00:57:26 -05:00
745696cba1
Remove "canonical" from a couple more places in docstrings which
...
I missed.
2021-02-14 19:25:59 -05:00
ccaa8b62ae
pre-commit stylistic fix
2021-02-11 19:35:28 -05:00
631460f45f
Rename various symbols and change various comments to refer to
...
normalization instead of canonicalization.
2021-02-11 19:33:57 -05:00
e513081100
Merge pull request #458 from chisholm/versioning_refinements
...
Versioning refinements
2021-02-06 22:59:18 -05:00
5971129b7c
Avoid potential KeyError in _is_versionable_type()
2021-02-05 17:42:04 -05:00
5a210192bd
pre-commit stylistic fix
2021-02-04 17:33:25 -05:00
9e9a61c71c
Fix bug with observation expression DNF transformer, where it was
...
not preserving operand order when distributing FOLLOWEDBY.
2021-02-04 16:45:39 -05:00
30fd8c3464
compact calls
2021-02-02 00:08:11 -05:00
a7eb4113de
minor change to align API
2021-02-02 00:04:04 -05:00
489970718f
WIP: changes to graph_similarity
...
busted main loop, symmetrical properties not present
2021-02-01 22:35:37 -05:00
24374e7a5f
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into main
2021-01-29 19:19:04 +01:00
bfc47e73f5
Merge pull request #485 from oasis-open/emmanvg-patch-1
...
Update CustomObservale decorator
2021-01-29 09:52:00 -05:00
624d71ed53
pre-commit stylistic fixes
2021-01-28 23:02:23 -05:00
0dd6462d60
Add some unit tests which try to version marking-definitions.
2021-01-28 23:02:23 -05:00
a97645abc3
Add some missing docstrings on a few exception classes.
2021-01-28 23:02:23 -05:00
c74d06aadc
Improve versioning.new_version() to better handle custom objects
...
and dicts, and add better raised exception types if versioning
couldn't be done. I changed workbench monkeypatching a bit, to
copy some class attributes over to the workbench wrapper
class-like callables, since some code expected those attributes
to be there (e.g. the versioning code).
2021-01-28 23:02:23 -05:00
3878788da4
Update is_sro docstring
2021-01-28 22:54:52 -05:00
98b0b2ed41
pre-commit stylistic fix
2021-01-28 19:32:27 -05:00
83abf78af5
Remove old compatibility code regarding importing the old
...
stix2.core module.
2021-01-28 19:21:57 -05:00
eead72aabc
Fix docstring typo in is_marking(). Made a minor docstring
...
update to is_sro() as well, so it doesn't talk as if you can
register custom SROs. That didn't actually make sense.
2021-01-27 22:25:41 -05:00
77d20c787a
Update observables.py
...
Add missing common properties in decorator closes #484
2021-01-27 11:31:14 -05:00
a62dfbb41b
missing common properties on CustomObservable decorator
2021-01-26 22:17:03 -05:00
f9b9e0d2d7
pre-commit stylistic fixes
2021-01-20 20:59:10 -05:00
404fcd04ca
Remove some ugly python2 compatibilty code from stix2.versioning
...
module, since we no longer support python2.
2021-01-20 20:58:13 -05:00
38067a6ec7
pre-commit stylistic fixes
2021-01-20 20:49:01 -05:00
92a478b39b
A minor revision to stix2.versioning: it's silly to look up a
...
class in the registry when you have an instance of one of those
classes. Because in that case, you can just get the class of the
instance and not deal with the registry at all.
2021-01-20 19:42:06 -05:00
5aadf1ae91
Add some unit tests for attempting to change ID contributing
...
properties of a 2.1 SCO with UUIDv5 ID, when creating a new
version.
2021-01-20 19:16:22 -05:00
473e7d0068
Change versioning module to use some of the is_* utility
...
functions. Changed some ">= 2.1" stix version semantics to be
"== 2.1", because we don't have any version >= 2.1, so they are
currently equivalent, and the is_*() functions don't support
STIX version ranges. They only support exact versions. We can
look at this again if a newer STIX version ever emerges.
Also added a class_for_type() function to the registry module,
which was useful for the versioning module changes described
above. I thought that function would be helpful in the parsing
module, to simplify code there, so I changed that module a bit
to use it.
2021-01-20 16:59:39 -05:00
fe2330af07
Improve is_sdo() et al utility functions with respect to
...
dict/mapping values: do a simple verification of the value's
STIX version, not just its type. Added a lot more unit tests to
test behavior on dicts. To make the implementation work, I had
to move the detect_spec_version() function out of the parsing
module and into utils. So that required small changes at all
its previous call sites.
2021-01-20 16:59:39 -05:00
f8c86f7352
Fixups after a rebase. There were several conflict resolutions
...
and I probably forgot some stuff...
2021-01-20 16:59:39 -05:00
bf284d0a0b
Fix silly docstring copy-paste typo
2021-01-20 16:59:39 -05:00
db1d0b736b
Remove registry.get_stix2_class_maps(), since now that the
...
class map structure is keyed by normal "X.Y" style versions,
the convenience that function provided is no longer necessary.
So it no longer makes sense to have the function (at least,
not for that reason). Change users of that function to use
the STIX2_OBJ_MAPS structure directly.
2021-01-20 16:59:39 -05:00
f88fba6751
Change the stix2 class map structure to be keyed at the top
...
level with STIX versions in the same format as is used everywhere
else in the API: "X.Y", as opposed to the "vXY" format used by
the version-specific python packages. This eliminates all of
the awkward conversion from public API format to "vXX" format.
Also a little bit of code rearranging in the registration module
to ensure that some STIX 2.1-specific checks are done whether
version 2.1 is given explicitly or is defaulted to.
In the same module I also added a missing import of
stix2.properties, since my IDE was claiming it could not find a
function from that module.
2021-01-20 16:59:38 -05:00
188f704b28
Remove a "this needs to be moved into the stix2 library" comment,
...
since this *is* in the stix2 library!
2021-01-20 16:59:38 -05:00
24307626b0
Move get_stix2_class_maps() from .utils to .registry (since it's
...
really just a simple accessor into the class maps table), and
change other code to use it, in places where it was simple and
made sense.
2021-01-20 16:59:38 -05:00
0f2ce0ac72
Add unit tests for the is_*() utility type checking functions.
2021-01-20 16:59:38 -05:00
51937232db
Fix to an import statement which was necessary due to the
...
circular import refactoring. I think I just forgot to include
this in the previous commit...
2021-01-20 16:59:38 -05:00
fa6cff8a34
WIP adding is_sdo() et al functions to this library. On hold
...
while I address circular import problems.
2021-01-20 16:59:38 -05:00
a48af17cf9
styling fixes
2021-01-15 16:05:57 -05:00
367b485fcd
write some tests to check new MarkingDefinition constraints
2021-01-15 16:01:36 -05:00
b696f14560
add content for basic incident testing
2021-01-15 15:13:30 -05:00
be0ebbad65
add test_incident.py
2021-01-15 13:53:43 -05:00
82390ba648
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into dev-extensions-proposal
2021-01-15 13:01:30 -05:00
a0d535336e
Merge 'master' and fix imports for consistency
2021-01-15 12:34:10 -05:00
7de5c458bb
Fix import sort order
2021-01-15 10:27:39 -05:00
a3f20dde7a
Use consistent import style in parsing.py
2021-01-15 10:27:23 -05:00
983f931ecd
some missing fixes...
...
- for some reason they only showed up on PY38
2021-01-13 19:48:33 -05:00
85c14d1502
all changes from add-trailing-commas v2.0.2
2021-01-13 17:52:15 -05:00
acc90c2f4c
changes brought by isort and add-trailing-commas
2021-01-13 17:50:21 -05:00
5d016142cf
Small tweaks: move the definition of DEFAULT_VERSION from the
...
top-level stix2 package to stix2.version but import it into
stix2. This makes it possible for someone to get the symbol
without needing to import all of stix2.
Change an "import X" style import to "from X import Y" in
stix2/__init__.py to be consistent with the other imports in
that file.
2021-01-13 11:22:34 -05:00
f51e309775
Refactor stix2.parsing into more focused modules:
...
- stix2.registry, which contains the class mapping structure
and code for scanning stix2 modules for its initial population
- stix2.registration, which contains code used to register custom
STIX types with the registry
- stix2.parsing, which contains code for creating instances of
registered stix2 classes from raw dicts.
This is intended to reduce circular import problems, by giving
dependent code the ability to import a module which has exactly
the functionality it needs, without pulling a lot of other stuff
it doesn't need. Fewer imports means less chance of an import
cycle.
2021-01-08 22:08:33 -05:00
a86b21dbf7
add checks for MarkingDefinition requirements
2020-12-23 16:15:31 -05:00
6a6f13c37b
rename the Class auto-naming from 'STIXExtension' to 'ExtensionDefinition'
2020-12-23 16:07:30 -05:00
a3fce3686a
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into dev-extensions-proposal
2020-12-23 15:08:10 -05:00
ef2ef95c3a
`stix-extension` to `extension-definition`
2020-12-22 21:59:18 -05:00
4127ea9afd
modify main codebase based on 7.3 Extension changes
2020-12-22 21:41:46 -05:00
33a472d8f5
define Incident stub
2020-12-22 17:46:29 -05:00
76eebeb549
expose **taxii_filters_dict on requests
2020-12-22 16:52:27 -05:00
ace64c4042
provide pagination support for requests in the TAXIICollectionSource
2020-12-21 17:53:53 -05:00
5bddf9321e
Bump version: 2.0.2 → 2.1.0
2020-11-20 17:37:58 -05:00
b55c3bb1df
Fix pattern equivalence doc style for consistency
2020-11-20 16:34:11 -05:00
119364c889
Merge branch 'master' into 472-issue
2020-11-20 10:02:46 -05:00
a82dc5e813
Merge pull request #475 from oasis-open/equivalence-indicator-patterns
...
Use pattern equivalence in indicators
2020-11-20 09:56:35 -05:00
53f451b097
Use pattern equivalence in indicators
2020-11-20 09:33:56 -05:00
e7242c9ae6
forgot one...
2020-11-19 08:48:57 -05:00
49985cc51d
fix ordering problem with Class definitions
2020-11-18 19:01:12 -05:00
c9bafaf5ae
fix typo for Class X509V3ExtensionsType
2020-11-18 18:08:57 -05:00
169ef87bc2
pre-commit stylistic fixes
2020-11-16 15:10:06 -05:00
f5bbbe7a3b
Fix bug with reference type enforcement on property
...
where_sighted_refs on Sighting.
2020-11-16 15:04:24 -05:00
aa77f2b174
add test cases
...
additional file changes based on test cases
2020-11-10 21:09:17 -05:00
e4165f96aa
major changes to support the extension mechanism
...
moved some version specific logic into their area, changes to decorators to support Object Registration with Extension
2020-11-10 18:32:58 -05:00
22c4351688
flatten the extensions map, remove enclosing_type from ExtensionsProperty
...
other minor changes
2020-11-10 17:08:51 -05:00
a751df32c6
Fix Location semantic equivalence check for Location objects without the latitude and longitude properties ( #467 )
...
* Fix Location semantic equivalence check for Location objects without the latitude and longitude properties.
Uses contribution from @zrush-mitre (#464 ).
Fixes #462 .
* Remove a line
2020-11-10 12:55:17 -05:00
4340be13c4
changes to the ExtensionsProperty
2020-11-09 20:58:34 -05:00
1180da7cc7
update to test cases
...
removing invalid test cases per new changes. updating some to reflect new changes to the Extensions Property, other minor ones
2020-11-09 20:35:22 -05:00
5cb52844dc
fixing typos on Object types
2020-11-05 12:56:30 -05:00
f0f8091516
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into main
2020-10-28 19:42:51 +01:00
b17f502e8f
expose the "extensions" property on all object types
...
remove restriction on MarkingDefinition Object
2020-10-19 22:18:45 -04:00
1bc11ce442
define the STIXExtension Object
2020-10-19 22:08:51 -04:00
97dfe092f9
re-order properties
2020-10-19 19:23:30 -04:00
e08a26a39c
Correct variable name
2020-10-18 21:09:07 -04:00
92ab1227ed
docstrings, changes to equivalence.ipynb
2020-10-16 17:12:52 -04:00
fb705c4885
Graph Equivalence ( #449 )
...
* new packages for graph and object-based semantic equivalence
* new method graphically_equivalent for Environment, move equivalence methods out
* object equivalence function, methods used for object-based moved here.
* new graph_equivalence methods
* add notes
* add support for versioning checks (default disabled)
* new tests to cover graph equivalence and new methods
* added more imports to environment.py to prevent breaking changes
* variable changes, new fields for checks, reset depth check per call
* flexibility when object is not available on graph.
* refactor debug logging message
* new file stix2.equivalence.graph_equivalence.rst and stix2.equivalence.object_equivalence.rst for docs
* API documentation for new modules
* additional text required to build docs
* add more test methods for list_semantic_check an graphically_equivalent/versioning
* add logging debug messages, code clean-up
* include individual scoring on results dict, fix issue on list_semantic_check not keeping highest score
* include results as summary in prop_scores, minor tweaks
* Update __init__.py
doctrings update
* apply feedback from pull request
- rename semantic_check to reference_check
- rename modules to graph and object respectively to eliminate redundancy
- remove created_by_ref and object_marking_refs from graph WEIGHTS and rebalance
* update docs/ entries
* add more checks, make max score based on actual objects checked instead of the full list, only create entry when type is present in WEIGHTS dictionary
update tests to reflect changes
* rename package patterns -> pattern
* documentation, moving weights around
* more documentation moving
* rename WEIGHTS variable for graph_equivalence
2020-10-16 11:35:26 -04:00
d17d01d165
Merge pull request #444 from chisholm/comp_ds_unversioned_objs
...
Update CompositeDataSource and deduplicate() support for unversioned objects
2020-10-15 08:57:55 -04:00
52d806b349
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into main
2020-10-13 17:53:12 +02:00
7b35b82996
TAXIICollectionSource custom object handling fix
2020-09-29 11:21:02 -04:00
3267036f33
Merge pull request #452 from oasis-open/api-reference-for-pattern-eq
...
Expose API Reference for Pattern Equivalence - ReadTheDocs
2020-09-18 13:52:02 -04:00
ddb25c544a
Merge pull request #456 from chisholm/fix_comparison_expression_root_type
...
Fix object type tracking for AST comparison expression 'AND'
2020-09-18 09:59:53 -04:00
7d64764ae3
Fix object type tracking for comparison expressions in the pattern
...
AST module.
2020-09-14 15:42:36 -04:00
bad42e5b78
pre-commit stylistic junk
2020-09-12 19:33:56 -04:00
ff35e8a01b
Add some unit tests for the AST make_constant() function.
2020-09-12 19:14:29 -04:00
f2691e89f5
Fix make_constant() in the AST module, to always return a
...
constant. It was failing to do so for timestamps, instead
returning a STIXdatetime object.
2020-09-12 19:14:29 -04:00
40b8af3845
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into main
2020-09-12 12:46:26 +02:00
Emmanuelle Vargas-Gonzalez