MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity
1,558 Commits
7 Branches
12 Tags
5.9 MiB
Commit Graph

1558 Commits (169ef87bc20e1e52a8eeaf31e45e3edb01d7945f)

Author SHA1 Message Date
Chris Lenk 10bdfe9e25 Fix KeyError in TAXII DataStore 2020-06-26 16:43:19 -04:00
Chris Lenk 3ef63d5e17 Update Workbench for 2.1 2020-06-26 16:43:19 -04:00
Chris Lenk d62f5ee141 Remove 'encoding' param from json.loads 
It's ignored since Python 3.1 and we've dropped 2.7.
 2020-06-26 16:43:19 -04:00
Chris Lenk e80d3bad2c Fix 2.0 HashesProperties 2020-06-26 16:43:19 -04:00
Chris Lenk f78b396648 Fix parsing tests 2020-06-26 16:43:19 -04:00
Chris Lenk b42b1cafa7 Move a couple tests for organization 2020-06-26 16:43:19 -04:00
Chris Lenk b2ee33208f Set STIX 2.1 as default, fix indicator.valid_from 2020-06-26 16:43:19 -04:00
Emmanuelle Vargas-Gonzalez 57b371903f
Merge pull request #418 from oasis-open/drop-old-python 
Drop support for Python versions older than 3.5
 2020-06-24 10:41:52 -04:00
Chris Lenk 3d3a513398
Merge pull request #417 from chisholm/fix_list_property 
Fix ListProperty
 2020-06-24 09:52:08 -04:00
Michael Chisholm bf5176f370 Add some new unit tests corresponding to ListProperty revamp. 2020-06-17 16:31:03 -04:00
Michael Chisholm bc51cd47bd Revamp ListProperty so its logic makes more sense. 2020-06-17 16:11:30 -04:00
Chris Lenk 41cfb4d382 Drop support for Python versions older than 3.5 2020-06-12 09:52:43 -04:00
Chris Lenk 9d05c9d3e2
Merge pull request #401 from chisholm/fix_versionable_detection 
Fix versionability detection
 2020-06-10 10:22:59 -04:00
Chris Lenk fdb8875f1d
Merge pull request #409 from chisholm/fix_sco_ref_props 
Change ObjectReferenceProperty to ReferenceProperty in 2.1 SCO classes
 2020-06-10 09:34:37 -04:00
Michael Chisholm 00b78e7a47 Stylistic pre-commit junk 2020-06-08 17:51:13 -04:00
Michael Chisholm 99bf4215a3 Change all uses of ObjectReferenceProperty in 2.1 SCO classes 
to ReferenceProperty.  Add a unit test to ensure that when a
stix2 object is passed as a value of a ReferenceProperty, that
the ID is properly pulled out and used as the actual property
value, and that it doesn't affect the deterministic ID
calculation.
 2020-06-08 17:24:33 -04:00
Chris Lenk 8bde22fa1f
Merge pull request #407 from emmanvg/flexibility-selector-syntax 
Update SELECTOR_REGEX for GranularMarkings
 2020-06-08 13:54:39 -04:00
Emmanuelle Vargas-Gonzalez aa18575c83 add `id` as special-case option in regex. closes #406 2020-06-08 09:27:12 -04:00
Chris Lenk 6faf6b9fa1
Merge pull request #402 from chisholm/fix_deterministic_ids 
Fix deterministic ids
 2020-06-08 07:51:45 -04:00
Michael Chisholm c13cb182db versioning related updates: 
- remove var 'properties_to_change' since it's unnecessary
- delete most of remove_custom_stix() since it was unnecessary,
  greatly simplify it
 2020-06-05 14:24:16 -04:00
Michael Chisholm 9c5f950d5b Add a new_version() restriction preventing SCO ID contributing 
properties from being changed, if a UUIDv5 is in use.  Changing
one of those properties would imply an ID change, which is not
allowed across versions.  Also:

- add a trailing comma
- change unchangable_properties to a set instead of a list,
  in case there are dupe props between STIX_UNMOD_PROPERTIES and
  sco_locked_props
 2020-06-05 14:24:16 -04:00
Michael Chisholm eaa7f17ee4 Fix versionability detection: _properties is an OrderedDict not 
a list of tuples! (despite what it looks like if you glance at it
quickly.)
 2020-06-05 14:24:16 -04:00
Michael Chisholm 15e75cb4de Python 2 compatibility fix in versionability detection. In 
python2, Mapping.keys() returns a list instead of a set!
 2020-06-05 14:24:16 -04:00
Michael Chisholm a05dbc42d5 Improve the docstring for new_version(). Especially with the 
three-value logic for allow_custom, it needed some much better
documentation.
 2020-06-05 14:24:16 -04:00
Michael Chisholm d4cecd6f51 In remove_custom_stix(), when creating the new version, 
use allow_custom=False to force custom properties to be
disallowed.  This is extra insurance against a custom prop
accidentally getting through.
 2020-06-05 14:24:16 -04:00
Michael Chisholm 78d3b2c4c5 Add stix2.utils import to v20/test_versioning.py since the module 
was used but not imported there.  Also import sorting from the
pre-commit hook.
 2020-06-05 14:24:16 -04:00
Michael Chisholm 5522050899 Improve versionability detection when creating new versions 
of objects.  Move versioning-related stuff out of stix2.utils
to its own module.  Some misc versioning-related fixes.
 2020-06-05 14:24:16 -04:00
Michael Chisholm 5a5484d464 Move/merge some deterministic ID tests from the observed-data SDO 
test suite to the test suite specific to testing deterministic
IDs.  This keeps the tests for that specific system in one place.
 2020-06-05 14:14:44 -04:00
Michael Chisholm f17f782134 Bugfixes to the json un-escaping function. Added some unit tests 
for that.
 2020-06-05 14:14:44 -04:00
Michael Chisholm 2179028c91 Fix deterministic ID behavior when an empty "hashes" property is 
given.  Now, an exception is raised.  Added a unit test for this.
 2020-06-05 14:14:44 -04:00
Michael Chisholm c94feae623 Add a deterministic ID unit test with an embedded object 2020-06-05 14:14:43 -04:00
Michael Chisholm fa981affa9 stupid python 3.8 pre-commit still not adding the right trailing 
commas....
 2020-06-05 14:14:43 -04:00
Michael Chisholm 9dcffd9fad Add some unit tests for deterministic IDs. 2020-06-05 14:14:43 -04:00
Michael Chisholm 1f5e8defd3 Argh, I fixed an RFC URL but forgot to fix the comment which 
described it and gave the RFC number...
 2020-06-05 14:14:43 -04:00
Michael Chisholm 22c0d5806c Trailing comma for the pre-commit hook 2020-06-05 14:14:43 -04:00
Michael Chisholm e22c37a16b Update a RFC URL to the latest version. I'd accidentally used 
one which had been obsoleted by a newer one.
 2020-06-05 14:14:43 -04:00
Michael Chisholm 6c2c4781e7 Revamp deterministic ID generation code to fix bugs. 2020-06-05 14:14:43 -04:00
Chris Lenk 41525f9be0
Merge pull request #400 from oasis-open/issue-398 
fixed start/stop qualifier constant issue
Fixes #398.
 2020-06-05 10:57:59 -04:00
Chris Lenk 1a46b13fe0
Merge pull request #404 from chisholm/fix_stix2_base_import 
Fix star-imports from stix2.v20 and v21
 2020-06-05 09:34:36 -04:00
Rich Piazza 53dfe40c30 only test start/stop timestamps if they are strings (2.0) 2020-06-05 09:25:06 -04:00
Rich Piazza 04af273d71 flaky 2020-06-05 09:17:42 -04:00
Michael Chisholm 7def04fd6f Add __all__'s to v20 and v21/__init__.py to ensure that 
star-imports from those modules get the right symbols.  "base"
was a problem because it was getting imported via
stix2/__init__.py and overwriting stix2.base, making the actual
stix2/base.py module inaccessible.
 2020-06-03 17:39:09 -04:00
Rich Piazza 977107e713 2.0 Start/Stop Quailifer uses StringConstants 2020-06-01 22:34:40 -04:00
Rich Piazza cfe0648c98 fixed start/stop qualifier constant issue 2020-05-26 15:12:02 -04:00
Chris Lenk 7e418252d5
Merge pull request #397 from chisholm/drop_dateutil 
Drop python-dateutil and switch to built-in datetime module
 2020-05-21 10:23:40 -04:00
Michael Chisholm 7955a41997 Drop python-dateutil as a dependency and switch to the builtin 
datetime module for parsing timestamps.  Dateutil proved too
slow.
 2020-05-20 15:06:53 -04:00
Chris Lenk 33e07edf3b
Merge pull request #393 from emmanvg/391-ssdeep-hash-case 
resolve problem with SSDEEP use in hashing-algorithm-ov
 2020-05-15 09:36:26 -04:00
Emmanuelle Vargas-Gonzalez b4dbc419f6 Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into 391-ssdeep-hash-case 2020-05-14 12:51:02 -04:00
Chris Lenk 658e70bf04
Merge pull request #392 from khdesai/fix_issue_389 
Fix issue 389 - Add property names to canonicalization for deterministic id gen
 2020-05-14 09:39:26 -04:00
Emmanuelle Vargas-Gonzalez 68f7ca6377 resolve problem with SSDEEP vocab use for 2.1, closes #391 2020-05-13 18:17:17 -04:00