MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

GH-138: ignore invalid JSON files.

stix2.0
Greg Back 2018-03-14 10:06:03 -05:00
parent bf233895ae
commit 5820fa0845
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stix2/datastore/filesystem.py
View File

@ -303,7 +303,11 @@ class FileSystemSource(DataSource):
for file_ in files: for file_ in files:
if not id_ or id_ == file_.split(".")[0]: if not id_ or id_ == file_.split(".")[0]:
# have to load into memory regardless to evaluate other filters # have to load into memory regardless to evaluate other filters
try:
stix_obj = json.load(open(os.path.join(root, file_))) stix_obj = json.load(open(os.path.join(root, file_)))
except UnicodeDecodeError: # likely not a JSON file
# TODO: log a warning somehow? (os.path.abspath(file_)))
continue
if stix_obj.get('type', '') == 'bundle': if stix_obj.get('type', '') == 'bundle':
stix_obj = stix_obj['objects'][0] stix_obj = stix_obj['objects'][0]
# check against other filters, add if match # check against other filters, add if match