Greg Back
a2e2407025
GH-188: Fixes for old Python syntax.
2018-06-27 12:49:00 -05:00
Greg Back
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
Greg Back
e749218f9b
GH-188: Test that references are always valid UUID v4.
2018-06-27 12:02:13 -05:00
Greg Back
e5903f1832
Sort constants.
2018-06-27 11:36:17 -05:00
Greg Back
845625c174
GH-188: WIP: Converting all IDs to be valid UUID v4.
2018-06-27 11:35:55 -05:00
Emmanuelle Vargas-Gonzalez
9cc74e88b6
Merge pull request #198 from treyka/stix2.1
...
update dict key limits per 2.1 spec
2018-06-26 12:57:44 -04:00
Emmanuelle Vargas-Gonzalez
59fdd3082e
Update tests.
2018-06-26 12:29:20 -04:00
Emmanuelle Vargas-Gonzalez
9baaad6e08
Sort imports.
2018-06-26 12:23:53 -04:00
Emmanuelle Vargas-Gonzalez
bee537137b
Update base.py
...
Fix STIXJSONIncludeOptionalDefaultsEncoder call to super()
2018-06-26 11:10:36 -04:00
Trey Darley
5cbe886cdb
split properties out by spec version
2018-06-26 09:32:24 +00:00
Trey Darley
d44c2abd0f
2.1 spec (somewhat inexplicably) limits dict keys to 250 chars
2018-06-26 09:23:52 +00:00
Trey Darley
cc58a3a4f4
2.1 removes 3 char limit on dict keys
2018-06-26 09:22:57 +00:00
Trey Darley
6b1da856dd
split properties out by spec version
2018-06-26 09:22:04 +00:00
Emmanuelle Vargas-Gonzalez
b852b91652
Reformat methods documentation
2018-06-25 10:06:07 -04:00
Emmanuelle Vargas-Gonzalez
0ddb7b3807
Update observables.RasterImageExt 'image_weight' property to 'image_width'
2018-06-25 08:55:12 -04:00
Emmanuelle Vargas-Gonzalez
abd172eb3f
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into stix2.1
2018-06-25 08:25:57 -04:00
Greg Back
b2c6acfbf6
GH-188: Restrict valid UUID values.
2018-06-22 14:40:30 -05:00
Greg Back
399a3a594e
Merge pull request #195 from oasis-open/194-raster-image-ext
...
Correct "image_weight" to "image_width".
2018-06-21 12:39:42 -05:00
Greg Back
fdf5937a71
GH-194: Remove unnecessary allow_custom kwarg.
2018-06-21 12:15:28 -05:00
Greg Back
7baeb153fa
Correct "image_weight" to "image_width".
...
Fix #194 .
2018-06-20 15:24:27 -05:00
Greg Back
53a1a0329a
Merge branch 'master' into stix2.1
2018-06-15 10:04:00 -05:00
Greg Back
2ec5ba44f8
Merge pull request #192 from chisholm/serialize_fix
...
Revamp code related to "pretty" JSON serialization
2018-06-15 10:02:40 -05:00
Greg Back
78c4d48bd9
Merge pull request #191 from chisholm/malware2.1
...
Malware2.1
2018-06-15 08:22:35 -05:00
Michael Chisholm
f09960d7ff
Revamp code related to "pretty" JSON serialization, fix lurking
...
crash bugs.
2018-06-14 21:29:50 -04:00
Michael Chisholm
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
Michael Chisholm
486c588306
Fix silly isort check errors..
2018-06-14 15:56:02 -04:00
Michael Chisholm
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
Michael Chisholm
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
Michael Chisholm
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
Michael Chisholm
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
Greg Back
2e0dfc6592
Merge remote-tracking branch 'origin/master' into stix2.1
2018-06-14 12:42:06 -05:00
Greg Back
ee059b05e6
Merge pull request #190 from stmtstk/patch-1
...
Cannot execute sample code.
2018-06-13 09:01:35 -05:00
stmtstk
2928824ec5
Cannot execute sample code.
...
I tried to execute the sample code of parse() on python 2.7 and 3.0.
But It occured JSONDecodeError because the "pattern" value of this sample JSON are described as multi-line.
To ensure that the sample code works, this value shuld be single-line.
2018-06-13 14:34:27 +09:00
Greg Back
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
Emmanuelle Vargas-Gonzalez
c12336b55a
Revert changes to iterables.
2018-06-12 15:03:25 -04:00
Emmanuelle Vargas-Gonzalez
78a480aa08
Change str.isdecimal to isdigit. On lists keep iterating if unless index is found
2018-06-12 14:45:15 -04:00
Emmanuelle Vargas-Gonzalez
fcffb165ad
Add tests for `find_property_index` and `iterate_over_values`
2018-06-12 14:38:35 -04:00
Emmanuelle Vargas-Gonzalez
94d6610ca1
Merge branch 'master' of github.com:LiamSennitt/cti-python-stix2
2018-06-12 12:58:01 -04:00
Emmanuelle Vargas-Gonzalez
9be819ea6a
Minor tweaks to return immediately after recursive call. Ensure dicts are matched alphabetically
2018-06-12 12:57:25 -04:00
Liam Sennitt
bdec14937d
fix flake8 errors in new test
2018-06-12 17:45:48 +01:00
Liam Sennitt
02894b5be6
add test for nested dictionary case
2018-06-12 17:32:46 +01:00
Greg Back
3ea4474615
Merge pull request #187 from chisholm/pickle_proof
...
Pickle-proof stix objects
2018-06-12 10:46:13 -05:00
Greg Back
75e478312a
Additional changes to match updates in v20 code.
2018-06-11 13:37:45 -05:00
Emmanuelle Vargas-Gonzalez
91cae0b5b7
Split `find_property_index` and support multiple levels of nesting.
2018-06-08 15:43:21 -04:00
Emmanuelle Vargas-Gonzalez
60da259805
Add an example on how to call the serialize() method.
2018-06-08 15:42:59 -04:00
Michael Chisholm
5a9f627669
Pickle-proof stix objects
2018-06-06 15:30:45 -04:00
Liam Sennitt
dbe9c3f087
fix custom STIX objects with nested dictionary error #184
2018-06-01 13:49:32 +01:00
Greg Back
3e159abd4d
WIP: Merge branch 'master' into stix2.1
2018-05-23 10:43:52 -05:00
Greg Back
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