From 85b9c9231360858392667c60da0e85c81e82dbd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Mon, 23 Dec 2019 21:32:17 +0100 Subject: [PATCH 1/4] fix: Event without hashable attribute Related #506 --- examples/feed-generator/generate.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/feed-generator/generate.py b/examples/feed-generator/generate.py index 174428c..ef911b7 100755 --- a/examples/feed-generator/generate.py +++ b/examples/feed-generator/generate.py @@ -68,7 +68,8 @@ if __name__ == '__main__': if not e_feed: print(f'Invalid distribution {e.distribution}, skipping') continue - hashes += [[h, e.uuid] for h in e_feed.pop('_hashes')] + if '_hashes' in e_feed: + hashes += [[h, e.uuid] for h in e_feed.pop('_hashes')] manifest.update(e_feed.pop('_manifest')) saveEvent(e_feed) print("Event " + str(counter) + "/" + str(total) + " exported.") From 566495a25f2d15bae9f9888209202d7656352e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Mon, 23 Dec 2019 21:43:26 +0100 Subject: [PATCH 2/4] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e1f43d2..f3e79a3 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +**IMPORTANT NOTE**: This library will require **at least** python 3.6 starting the 1st of January 2020. If you have to legacy versions of python, please use PyMISP v2.4.119.1, and consider updating your system(s). Anything released within the last 2 years will do, starting with Ubuntu 18.04. + README ====== From 4e50f58a74bb96e731ec061862103026439baaa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Tue, 24 Dec 2019 00:16:05 +0100 Subject: [PATCH 3/4] fix: Feed generator was broken Fix #506 --- examples/feed-generator/generate.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/feed-generator/generate.py b/examples/feed-generator/generate.py index ef911b7..a8c95c4 100755 --- a/examples/feed-generator/generate.py +++ b/examples/feed-generator/generate.py @@ -22,7 +22,7 @@ def init(): def saveEvent(event): try: - with open(os.path.join(outputdir, f'{event["uuid"]}.json'), 'w') as f: + with open(os.path.join(outputdir, f'{event["Event"]["uuid"]}.json'), 'w') as f: json.dump(event, f, indent=2) except Exception as e: print(e) @@ -68,9 +68,8 @@ if __name__ == '__main__': if not e_feed: print(f'Invalid distribution {e.distribution}, skipping') continue - if '_hashes' in e_feed: - hashes += [[h, e.uuid] for h in e_feed.pop('_hashes')] - manifest.update(e_feed.pop('_manifest')) + hashes += [[h, e.uuid] for h in e_feed['Event'].pop('_hashes')] + manifest.update(e_feed['Event'].pop('_manifest')) saveEvent(e_feed) print("Event " + str(counter) + "/" + str(total) + " exported.") counter += 1 From 70510f5aa842fcc5713c7e6c10b6e7dbd1c27a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Thu, 26 Dec 2019 17:13:59 +0100 Subject: [PATCH 4/4] chg: Bump misp-objects --- pymisp/data/misp-objects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pymisp/data/misp-objects b/pymisp/data/misp-objects index 33a7d6b..bce1018 160000 --- a/pymisp/data/misp-objects +++ b/pymisp/data/misp-objects @@ -1 +1 @@ -Subproject commit 33a7d6b574b7354ba8243ba461bfb30db0528023 +Subproject commit bce101832597b5f62679ac0299b2b4ef4681a145