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

Remove query_by_type 

It's not that much of a shortcut and we can add it back in later if it
makes sense.
stix2.0
Chris Lenk 2018-04-04 14:02:39 -04:00
parent f951b9b09e
commit 589c00064b
4 changed files with 38 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
stix2/datastore/__init__.py
View File

@ -298,23 +298,6 @@ class DataSource(with_metaclass(ABCMeta)):
"""
def query_by_type(self, obj_type, filters=None):
"""Retrieve all objects of the given STIX object type.
This helper function is a shortcut that calls query() under the hood.
Args:
obj_type (str): The STIX object type to retrieve.
filters (list, optional): A list of additional filters to apply to
the query.
Returns:
list: The STIX objects that matched the query.
"""
filter_list = _assemble_filters(filters, [Filter('type', '=', obj_type)])
return self.query(filter_list)
def creator_of(self, obj):
"""Retrieve the Identity refered to by the object's `created_by_ref`.
@ -376,7 +359,7 @@ class DataSource(with_metaclass(ABCMeta)):
return results
def related_to(self, obj, relationship_type=None, source_only=False, target_only=False, filters=None):
def related_to(self, obj, relationship_type=None, source_only=False, target_only=False, filters=[]):
"""Retrieve STIX Objects that have a Relationship involving the given
STIX object.

1
stix2/environment.py
View File

@ -114,7 +114,6 @@ class Environment(DataStoreMixin):
.. automethod:: get
.. automethod:: all_versions
.. automethod:: query
.. automethod:: query_by_type
.. automethod:: creator_of
.. automethod:: relationships
.. automethod:: related_to

4
stix2/test/test_environment.py
View File

@ -164,10 +164,6 @@ def test_environment_no_datastore():
env.query(INDICATOR_ID)
assert 'Environment has no data source' in str(excinfo.value)
with pytest.raises(AttributeError) as excinfo:
env.query_by_type('indicator')
assert 'Environment has no data source' in str(excinfo.value)
with pytest.raises(AttributeError) as excinfo:
env.relationships(INDICATOR_ID)
assert 'Environment has no data source' in str(excinfo.value)

63
stix2/workbench.py
View File

@ -8,7 +8,6 @@
.. autofunction:: get
.. autofunction:: all_versions
.. autofunction:: query
.. autofunction:: query_by_type
.. autofunction:: creator_of
.. autofunction:: relationships
.. autofunction:: related_to
@ -49,6 +48,7 @@ from . import (AlternateDataStream, ArchiveExt, Artifact, AutonomousSystem, # n
WindowsPEOptionalHeaderType, WindowsPESection,
WindowsProcessExt, WindowsRegistryKey, WindowsRegistryValueType,
WindowsServiceExt, X509Certificate, X509V3ExtenstionsType)
from .datastore.filters import _assemble_filters
# Use an implicit MemoryStore
_environ = Environment(store=MemoryStore())
@ -61,7 +61,6 @@ set_default_object_marking_refs = _environ.set_default_object_marking_refs
get = _environ.get
all_versions = _environ.all_versions
query = _environ.query
query_by_type = _environ.query_by_type
creator_of = _environ.creator_of
relationships = _environ.relationships
related_to = _environ.related_to
@ -149,7 +148,7 @@ _setup_workbench()
# Functions to get all objects of a specific type
def attack_patterns(filters=None):
def attack_patterns(filters=[]):
"""Retrieve all Attack Pattern objects.
Args:
@ -157,10 +156,11 @@ def attack_patterns(filters=None):
the query.
"""
return query_by_type('attack-pattern', filters)
filter_list = _assemble_filters(filters, [Filter('type', '=', 'attack-pattern')])
return query(filter_list)
def campaigns(filters=None):
def campaigns(filters=[]):
"""Retrieve all Campaign objects.
Args:
@ -168,10 +168,11 @@ def campaigns(filters=None):
the query.
"""
return query_by_type('campaign', filters)
filter_list = _assemble_filters(filters, [Filter('type', '=', 'campaign')])
return query(filter_list)
def courses_of_action(filters=None):
def courses_of_action(filters=[]):
"""Retrieve all Course of Action objects.
Args:
@ -179,10 +180,11 @@ def courses_of_action(filters=None):
the query.
"""
return query_by_type('course-of-action', filters)
filter_list = _assemble_filters(filters, [Filter('type', '=', 'course-of-action')])
return query(filter_list)
def identities(filters=None):
def identities(filters=[]):
"""Retrieve all Identity objects.
Args:
@ -190,10 +192,11 @@ def identities(filters=None):
the query.
"""
return query_by_type('identity', filters)
filter_list = _assemble_filters(filters, [Filter('type', '=', 'identity')])
return query(filter_list)
def indicators(filters=None):
def indicators(filters=[]):
"""Retrieve all Indicator objects.
Args:
@ -201,10 +204,11 @@ def indicators(filters=None):
the query.
"""
return query_by_type('indicator', filters)
filter_list = _assemble_filters(filters, [Filter('type', '=', 'indicator')])
return query(filter_list)
def intrusion_sets(filters=None):
def intrusion_sets(filters=[]):
"""Retrieve all Intrusion Set objects.
Args:
@ -212,10 +216,11 @@ def intrusion_sets(filters=None):
the query.
"""
return query_by_type('intrusion-set', filters)
filter_list = _assemble_filters(filters, [Filter('type', '=', 'intrusion-set')])
return query(filter_list)
def malware(filters=None):
def malware(filters=[]):
"""Retrieve all Malware objects.
Args:
@ -223,10 +228,11 @@ def malware(filters=None):
the query.
"""
return query_by_type('malware', filters)
filter_list = _assemble_filters(filters, [Filter('type', '=', 'malware')])
return query(filter_list)
def observed_data(filters=None):
def observed_data(filters=[]):
"""Retrieve all Observed Data objects.
Args:
@ -234,10 +240,11 @@ def observed_data(filters=None):
the query.
"""
return query_by_type('observed-data', filters)
filter_list = _assemble_filters(filters, [Filter('type', '=', 'observed-data')])
return query(filter_list)
def reports(filters=None):
def reports(filters=[]):
"""Retrieve all Report objects.
Args:
@ -245,10 +252,11 @@ def reports(filters=None):
the query.
"""
return query_by_type('report', filters)
filter_list = _assemble_filters(filters, [Filter('type', '=', 'report')])
return query(filter_list)
def threat_actors(filters=None):
def threat_actors(filters=[]):
"""Retrieve all Threat Actor objects.
Args:
@ -256,10 +264,11 @@ def threat_actors(filters=None):
the query.
"""
return query_by_type('threat-actor', filters)
filter_list = _assemble_filters(filters, [Filter('type', '=', 'threat-actor')])
return query(filter_list)
def tools(filters=None):
def tools(filters=[]):
"""Retrieve all Tool objects.
Args:
@ -267,10 +276,11 @@ def tools(filters=None):
the query.
"""
return query_by_type('tool', filters)
filter_list = _assemble_filters(filters, [Filter('type', '=', 'tool')])
return query(filter_list)
def vulnerabilities(filters=None):
def vulnerabilities(filters=[]):
"""Retrieve all Vulnerability objects.
Args:
@ -278,4 +288,5 @@ def vulnerabilities(filters=None):
the query.
"""
return query_by_type('vulnerability', filters)
filter_list = _assemble_filters(filters, [Filter('type', '=', 'vulnerability')])
return query(filter_list)