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

Merge pull request #1 from khdesai/fix_issue_232 

Fix issue 232
master
Kartikey Desai 2019-01-09 10:55:28 -05:00 committed by GitHub
parent 06e23b08b8 77b2e0e3e3
commit 5d08edb8b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stix2/datastore/filesystem.py
View File

@ -1,7 +1,4 @@
"""Python STIX2 FileSystem Source/Sink""" """Python STIX2 FileSystem Source/Sink"""
# Temporary while we address TODO statement
from __future__ import print_function
import errno import errno
import io import io
import json import json
@ -15,7 +12,7 @@ import six
from stix2 import v20, v21 from stix2 import v20, v21
from stix2.base import _STIXBase from stix2.base import _STIXBase
from stix2.core import parse from stix2.core import parse
from stix2.datastore import DataSink, DataSource, DataStoreMixin from stix2.datastore import DataSink, DataSource, DataStoreMixin, DataSourceError
from stix2.datastore.filters import Filter, FilterSet, apply_common_filters from stix2.datastore.filters import Filter, FilterSet, apply_common_filters
from stix2.utils import format_datetime, get_type_from_id, is_marking from stix2.utils import format_datetime, get_type_from_id, is_marking
@ -544,9 +541,8 @@ class FileSystemSink(DataSink):
else: else:
stix_obj = v20.Bundle(stix_obj, allow_custom=self.allow_custom) stix_obj = v20.Bundle(stix_obj, allow_custom=self.allow_custom)
# TODO: Better handling of the overwriting case.
if os.path.isfile(file_path): if os.path.isfile(file_path):
print("Attempted to overwrite file!", file_path, file=sys.stderr) raise DataSourceError("Attempted to overwrite file (!) at: {}".format(file_path))
else: else:
with io.open(file_path, 'w', encoding=encoding) as f: with io.open(file_path, 'w', encoding=encoding) as f:
stix_obj = stix_obj.serialize(pretty=True, encoding=encoding, ensure_ascii=False) stix_obj = stix_obj.serialize(pretty=True, encoding=encoding, ensure_ascii=False)