Michael Chisholm
f301bc144f
Disable custom vocab enforcement. Custom values for open-vocab
...
properties are now always accepted and not considered
customizations (has_custom will be False). Just commented out
the enforcement code and xfail'd the unit tests, which makes it
easy to reinstate these behaviors later. It was decided this
is too likely to break user code, and we don't currently have
a way to disallow customizations in other places while still
allowing custom open vocab values. Safest to always allow
custom open vocab values, for now.
2021-04-14 12:48:32 -04:00
Michael Chisholm
33128908c7
Another pre-commit stylistic fix. Necessary since apparently
...
the git action uses a more recent version of pre-commit than
travis did, and the newer pre-commit requires different things
than the old one did.
2021-03-31 21:31:59 -04:00
Michael Chisholm
82148aa1ac
Pre-commit stylistic fix
2021-03-31 21:27:06 -04:00
Michael Chisholm
e735b537c7
Remove a workaround which was used in the 2.0 and 2.1 Report
...
objects, to structure object_refs type requirements as an empty
blacklist, instead of a whitelist. I think it was originally
necessary due to the older implementation of ReferenceProperty
which was in place at the time. With the implementation change
to invert whitelists with generics to blacklists when
allow_custom=True, a "full" whitelist is internally converted to
an empty blacklist anyway, so it winds up being the same thing.
But I think the full whitelist looks better in the code, so I
prefer that to the empty blacklist.
2021-03-31 20:56:31 -04:00
Michael Chisholm
0ddf0d2ca8
Clean up ReferenceProperty.clean(), to use new APIs which are
...
available after the rebase. This simplifies the implementation.
Also made utils.to_enum() a module public function, since I
needed to use it outside that module. Misc pre-commit stylistic
fixes.
2021-03-31 20:01:27 -04:00
Michael Chisholm
c8b9eab53d
Fixed some more silliness in properties.py... was it a rebase
...
glitch? Something else I overlooked? Not sure.
2021-03-31 16:49:14 -04:00
Michael Chisholm
6f60bed235
Make a minor post-rebase fix
2021-03-31 16:21:35 -04:00
Michael Chisholm
c8c4e89415
Add back usage of spec_version where HashesProperty is used for
...
various STIX objects. Also pre-commit stylistic fixes...
2021-03-31 16:20:33 -04:00
Michael Chisholm
a8a65599bf
Add back spec_version kwarg to HashesProperty, since it was used
...
to check key lengths. Added some unit tests for hash keys.
Also added a library hash support test module I'd forgotten to
add before.
2021-03-31 16:20:33 -04:00
Michael Chisholm
c590de8ea5
Add proper customization enforcement for open vocabs. This adds
...
a new OpenVocabProperty class. It also requires a redesign of
HashesProperty and redoes general library support for hash
algorithms.
2021-03-31 16:20:28 -04:00
Michael Chisholm
62ee2b2b0a
Pre-commit changes. Also remove a dupe test function which
...
slipped through due to a rather complex rebase... not too
surprising I missed it.
2021-03-31 15:32:54 -04:00
Michael Chisholm
414694d8fa
Add support in ReferenceProperty for hybrid object type
...
constraints (i.e. both generic type categories and specific
types). Also:
- more expansion/refinement of reference property unit tests
- bugfix: SROs are in OBJ_MAP too, it's not just SDOs! Oops...
- pre-commit stylistic fixes
2021-03-31 15:32:51 -04:00
Michael Chisholm
986404b7b7
In the test_properties.py test suites, I thought code like
...
assert prop.clean(...)
doesn't test well enough since clean() methods on this branch
produce 2-tuples, and you should test what's in the tuple, not
just that it returned something non-empty. So I fixed it in
several places to test the tuple contents.
2021-03-31 15:26:11 -04:00
Michael Chisholm
03c265c3a3
Add a check in ReferenceProperty constructor for an impossible
...
to satisfy type constraint: empty whitelist. It would be silly
for anyone to do that, but I should check just in case I guess.
2021-03-31 15:26:11 -04:00
Michael Chisholm
c7dd58ed89
Further ReferenceProperty refinements: make allow_custom=True
...
work when a whitelist of generic category types is used.
Disallow hybrid constraints (both generic and specific at the
same time). Add more unit tests.
2021-03-31 15:26:09 -04:00
Michael Chisholm
387ce7e7cb
Fix Report SDO: I'd fixed ReferenceProperty to work the way I
...
thought it should, but forgot to fix Report to use
ReferenceProperty in the way I thought it should! Oops.
Added some tests to ensure Report is working property with
custom ID types in object_refs.
2021-03-31 15:22:00 -04:00
Michael Chisholm
d2f960f2fc
Initial revamp of customization enforcement and detection.
2021-03-31 15:21:55 -04:00
Chris Lenk
2743b90fc0
Merge pull request #500 from emmanvg/add-fp-serialize
...
fp write for STIX Objects
2021-03-19 21:13:30 -04:00
Emmanuelle Vargas-Gonzalez
19196654c5
Apply suggestions from code review
...
Co-authored-by: Chris Lenk <clenk@users.noreply.github.com>
2021-03-19 15:31:01 -04:00
Emmanuelle Vargas-Gonzalez
c2d360d223
apply fp_serialize() changes on main serialize() method
2021-03-18 18:08:31 -04:00
Emmanuelle Vargas-Gonzalez
922de111ed
minor tweaks to docstrings
2021-03-18 10:14:36 -04:00
Emmanuelle Vargas-Gonzalez
2ea9c0c63c
use it on filesystem.py data sink
2021-03-17 15:15:26 -04:00
Emmanuelle Vargas-Gonzalez
827f622c04
provide ability to stream STIX output to fp ``.write()`` file-like object
2021-03-17 15:01:49 -04:00
Chris Lenk
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
Chris Lenk
ccf3b1a0fc
Merge pull request #480 from emmanvg/479-pagination-taxii-datastore
...
Support Pagination in TAXII DataStore
2021-03-15 09:33:42 -04:00
Emmanuelle Vargas-Gonzalez
f7ebd34c8c
Update __init__.py
...
fix incident entry
2021-03-12 16:49:23 -05:00
Emmanuelle Vargas-Gonzalez
7e5d31742c
remove `six` from tests
2021-03-12 16:46:34 -05:00
Emmanuelle Vargas-Gonzalez
34e9da805f
move taxii2client dependency to 2.3.0
2021-03-12 16:31:28 -05:00
Chris Lenk
f155e3e571
Merge pull request #496 from emmanvg/semantic-equivalence-part3
...
Similarity/Equivalence Changes
2021-03-10 14:08:45 -05:00
Emmanuelle Vargas-Gonzalez
c9e66def60
rename test, update the rest of the docstrings for object_similarity() and object_equivalence()
2021-03-10 13:32:02 -05:00
Emmanuelle Vargas-Gonzalez
7d7c56c64b
Update stix2/environment.py
2021-03-10 09:52:24 -05:00
Emmanuelle Vargas-Gonzalez
262284444e
Update stix2/environment.py
...
Co-authored-by: Chris Lenk <clenk@users.noreply.github.com>
2021-03-10 09:52:15 -05:00
Emmanuelle Vargas-Gonzalez
fb6852b38f
update test suite
2021-03-01 20:47:30 -05:00
Emmanuelle Vargas-Gonzalez
bd996b8750
Update __init__.py
2021-03-01 14:40:05 -05:00
Emmanuelle Vargas-Gonzalez
72a12e96ba
update guide example, conf.py and remove some unused imports
2021-03-01 13:14:03 -05:00
Emmanuelle Vargas-Gonzalez
e4e6f46089
change key name for _refs check
2021-03-01 12:54:01 -05:00
Emmanuelle Vargas-Gonzalez
3efa4c1ce9
revert part changes
2021-03-01 12:44:35 -05:00
Emmanuelle Vargas-Gonzalez
d2e867b52e
docstring corrections
2021-03-01 12:29:33 -05:00
Emmanuelle Vargas-Gonzalez
ff5014c606
expose configuration options, combine weight dictionary, update tests
2021-03-01 12:27:52 -05:00
Emmanuelle Vargas-Gonzalez
f9a52eeed3
WIP: changes to both similarity functions, expose settings
2021-02-26 19:19:33 -05:00
Chris Lenk
173575205a
Merge pull request #493 from oasis-open/equivalence-guide
...
Update the semantic equivalence user guide page
2021-02-19 17:04:31 -05:00
Chris Lenk
4825f5e303
Small touchups
2021-02-19 16:57:15 -05:00
Emmanuelle Vargas-Gonzalez
ecf952c07b
it updated itself...
2021-02-19 14:50:52 -05:00
Emmanuelle Vargas-Gonzalez
2308528957
add text and example for equivalence.ipynb
2021-02-19 14:48:23 -05:00
Chris Lenk
35f4bb0443
Update the semantic equivalence user guide page
...
Differentiate between similarity and equivalence, and update functions
to their new names and locations.
2021-02-18 23:45:38 -05:00
Chris Lenk
4bccfd26bd
Merge pull request #492 from oasis-open/drop-six
...
Drop 'six' dependency (backwards breaking)
2021-02-18 23:45:13 -05:00
Chris Lenk
64608e7bea
Merge pull request #491 from emmanvg/graph-eq-changes
...
Graph Equivalence Changes
2021-02-18 23:44:39 -05:00
Chris Lenk
b7b1b54afb
Remove 'six' from config
2021-02-18 23:39:24 -05:00
Chris Lenk
528d956f4a
Specify lowest supported Python version
2021-02-18 20:49:47 -05:00
Chris Lenk
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