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 #92 from oasis-open/issue66 

Fix #66 - checking STIX obj ID from TAXII server
stix2.0
Chris Lenk 2017-10-31 14:06:34 -04:00 committed by GitHub
parent 4ffad6d34f d8e4f1ab98
commit 482135465b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 2315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2357
docs/guide/taxii.ipynb
View File

File diff suppressed because it is too large Load Diff

22
stix2/sources/taxii.py
View File

@ -1,9 +1,5 @@
""" """
Python STIX 2.0 TAXII Source/Sink Python STIX 2.x TaxiiCollectionStore
TODO:
Test everything
""" """
from stix2.base import _STIXBase from stix2.base import _STIXBase
@ -124,8 +120,10 @@ class TAXIICollectionSource(DataSource):
stix_obj = list(apply_common_filters(stix_objs, query)) stix_obj = list(apply_common_filters(stix_objs, query))
if len(stix_obj): if len(stix_obj):
stix_obj = stix_obj[0] stix_obj = parse(stix_obj[0])
stix_obj = parse(stix_obj) if stix_obj.id != stix_id:
# check - was added to handle erroneous TAXII servers
stix_obj = None
else: else:
stix_obj = None stix_obj = None
@ -153,7 +151,13 @@ class TAXIICollectionSource(DataSource):
all_data = self.query(query=query, _composite_filters=_composite_filters) all_data = self.query(query=query, _composite_filters=_composite_filters)
return all_data # parse STIX objects from TAXII returned json
all_data = [parse(stix_obj) for stix_obj in all_data]
# check - was added to handle erroneous TAXII servers
all_data_clean = [stix_obj for stix_obj in all_data if stix_obj.id == stix_id]
return all_data_clean
def query(self, query=None, _composite_filters=None): def query(self, query=None, _composite_filters=None):
"""search and retreive STIX objects based on the complete query """search and retreive STIX objects based on the complete query
@ -181,7 +185,7 @@ class TAXIICollectionSource(DataSource):
if not isinstance(query, list): if not isinstance(query, list):
# make sure dont make set from a Filter object, # make sure dont make set from a Filter object,
# need to make a set from a list of Filter objects (even if just one Filter) # need to make a set from a list of Filter objects (even if just one Filter)
query = list(query) query = [query]
query = set(query) query = set(query)
# combine all query filters # combine all query filters