Commit Graph

948 Commits (aaddeb8b97f86e1aa2c2a80bebdc59dc506c706f)

Author SHA1 Message Date
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
Chris Lenk 636630a5aa Bump version: 1.0.1 → 1.0.2 2018-05-18 13:06:32 -04:00
Chris Lenk 1a62e62c4d Update CHANGELOG for v1.0.2 2018-05-18 13:05:58 -04:00
= e484b7c25f formatting 2018-05-18 11:45:40 -04:00
= 6004ec597c solution to get 404 mocking problem 2018-05-18 11:19:05 -04:00
Greg Back be30caab70
Merge pull request #180 from oasis-open/179-allow-custom
Fix 2 more allow custom bugs
2018-05-17 12:21:12 -05:00
Chris Lenk ddc09f70c7 Set allow_custom if using a custom_properties dict
Fixes #179.
2018-05-17 09:04:44 -04:00
Chris Lenk cf972479ed Pass allow_custom to object dicts in a Bundle 2018-05-16 15:37:30 -04:00
= 8fc421e7d4 think the mock client was erroneous for get_object(), couldnt get object by id, just returned random object 2018-05-16 15:17:34 -04:00
= a3313bc08f creating native DataSourceError exception class to wrap taxii client and server errors 2018-05-16 13:23:50 -04:00
Greg Back b536af8e48
Merge pull request #178 from oasis-open/176-allow_custom
Allow Custom when adding objects to ObservedData or extensions to a Cyber Observable
2018-05-16 11:33:08 -05:00
Chris Lenk 69c31ca3fc Pass allow_custom to ExtensionsProperty
Also fix bug caused by _properties being a class variable rather than an
instance variable. If you created an object with allow_custom,
allow_custom would be set for all future instances.
2018-05-16 12:14:33 -04:00
Greg Back 275ca19998 Clean up isort settings. 2018-05-15 17:16:23 -05:00
= 2b4c5bf264 handling and modifying exception messages in a manner acceptable by all python versions 2018-05-15 17:42:19 -04:00
= 0d3f80f2fe removing taxii 503 error test as not reproducible in Travis environment 2018-05-15 15:41:46 -04:00
= 2392912533 handle TAXII client/server errors according to decided policy 2018-05-15 11:28:34 -04:00
Chris Lenk 06e5a33639 Pass allow_custom when adding to ObservedData 2018-05-11 17:28:55 -04:00
Greg Back 3f80c07342 Add tox checks for README. 2018-05-02 12:37:44 -05:00
Chris Lenk 102623b29a Bump version: 1.0.0 → 1.0.1 2018-04-27 16:51:47 -04:00