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

Create TAXII query correctly. closes #169

stix2.0
Emmanuelle Vargas-Gonzalez 2018-04-23 14:11:08 -04:00
parent 99a8f9e871
commit 8a9acfe487
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
stix2/datastore/taxii.py
View File

@ -176,8 +176,8 @@ class TAXIICollectionSource(DataSource):
""" """
# make query in TAXII query format since 'id' is TAXII field # make query in TAXII query format since 'id' is TAXII field
query = [ query = [
Filter("match[id]", "=", stix_id), Filter("id", "=", stix_id),
Filter("match[version]", "=", "all") Filter("version", "=", "all")
] ]
all_data = self.query(query=query, _composite_filters=_composite_filters) all_data = self.query(query=query, _composite_filters=_composite_filters)
@ -232,7 +232,8 @@ class TAXIICollectionSource(DataSource):
all_data = deduplicate(all_data) all_data = deduplicate(all_data)
# apply local (CompositeDataSource, TAXIICollectionSource and query) filters # apply local (CompositeDataSource, TAXIICollectionSource and query) filters
all_data = list(apply_common_filters(all_data, (query - taxii_filters))) query.remove(taxii_filters)
all_data = list(apply_common_filters(all_data, query))
except HTTPError: except HTTPError:
# if resources not found or access is denied from TAXII server, return empty list # if resources not found or access is denied from TAXII server, return empty list
@ -249,7 +250,7 @@ class TAXIICollectionSource(DataSource):
Does not put in TAXII spec format as the TAXII2Client (that we use) Does not put in TAXII spec format as the TAXII2Client (that we use)
does this for us. does this for us.
NOTE: Notes:
Currently, the TAXII2Client can handle TAXII filters where the Currently, the TAXII2Client can handle TAXII filters where the
filter value is list, as both a comma-seperated string or python list filter value is list, as both a comma-seperated string or python list
@ -265,7 +266,8 @@ class TAXIICollectionSource(DataSource):
query (list): list of filters to extract which ones are TAXII query (list): list of filters to extract which ones are TAXII
specific. specific.
Returns: a list of the TAXII filters Returns:
A list of TAXII filters that meet the TAXII filtering parameters.
""" """
taxii_filters = [] taxii_filters = []