From 659e1fd90d3f252beaf6815a75f08b1ffa670139 Mon Sep 17 00:00:00 2001 From: Michael Chisholm Date: Thu, 26 Aug 2021 20:55:35 -0400 Subject: [PATCH 1/5] Fix transform from Filter object to TAXII filter to look at the filter operator; TAXII filters only support equals. --- stix2/datastore/taxii.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stix2/datastore/taxii.py b/stix2/datastore/taxii.py index 04b3c83..f82f017 100644 --- a/stix2/datastore/taxii.py +++ b/stix2/datastore/taxii.py @@ -343,8 +343,8 @@ class TAXIICollectionSource(DataSource): For instance - "?match[type]=indicator,sighting" can be in a filter in any of these formats: - Filter("type", "", "indicator,sighting") - Filter("type", "", ["indicator", "sighting"]) + Filter("type", "=", "indicator,sighting") + Filter("type", "=", ["indicator", "sighting"]) Args: query (list): list of filters to extract which ones are TAXII @@ -357,7 +357,7 @@ class TAXIICollectionSource(DataSource): taxii_filters = [] for filter_ in query: - if filter_.property in TAXII_FILTERS: + if filter_.property in TAXII_FILTERS and filter_.op == "=": taxii_filters.append(filter_) return taxii_filters From 66535bb550a252b048ad79226e34f9f6a2c651b7 Mon Sep 17 00:00:00 2001 From: Emmanuelle Vargas-Gonzalez Date: Mon, 30 Aug 2021 20:58:21 -0400 Subject: [PATCH 2/5] update README.rst --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 6bc68d4..7048577 100644 --- a/README.rst +++ b/README.rst @@ -68,8 +68,8 @@ For more in-depth documentation, please see `https://stix2.readthedocs.io/ `__ -published on 25 January 2021 currently at the Committee Specification (CS) 02 level. +This version of cti-python-stix2 brings support to `STIX Version 2.1 `__ +published on 10 June 2021 currently at the Committee Specification (CS) 03 level, also know as the "OASIS Standard". The stix2 Python library supports multiple versions of the STIX 2 Technical Specification. The library will be updated to support new Committee From 87d79445dcd3044147bc61bab305f6c19e2291cd Mon Sep 17 00:00:00 2001 From: Emmanuelle Vargas-Gonzalez Date: Mon, 30 Aug 2021 20:59:08 -0400 Subject: [PATCH 3/5] update maintainers --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index f382412..f383ebd 100644 --- a/setup.py +++ b/setup.py @@ -31,8 +31,8 @@ setup( url='https://oasis-open.github.io/cti-documentation/', author='OASIS Cyber Threat Intelligence Technical Committee', author_email='cti-users@lists.oasis-open.org', - maintainer='Chris Lenk, Emmanuelle Vargas-Gonzalez', - maintainer_email='clenk@mitre.org, emmanuelle@mitre.org', + maintainer='Chris Lenk', + maintainer_email='clenk@mitre.org', license='BSD', classifiers=[ 'Development Status :: 4 - Beta', From f5ea1396a1f5bda2684e387089142eabed0a2233 Mon Sep 17 00:00:00 2001 From: Chris Lenk Date: Fri, 24 Sep 2021 09:33:40 -0400 Subject: [PATCH 4/5] Update CHANGELOG for v3.0.1 --- CHANGELOG | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 6fb4c06..af9ce86 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,13 +1,21 @@ CHANGELOG ========= +3.0.1 2021-09-24 + +* #513 Fixes check for reference properties to apply to all custom objects, not + just custom observables (@maybe-sybr) +* #526 Fixes TAXIICollection queries to propagate HTTPErrors, not ignore them +* #528 Fixes bug where all TAXII filters were converted to exact matches + + 3.0.0 2021-07-13 -This version aligns with the STIX 2.1 CS 03 (WD12) document, also know as the "OASIS Standard". +This version aligns with the STIX 2.1 CS 03 (WD12) document, also known as the "OASIS Standard". Main Changes #509 Add Sighting.summary default value -#503 Revamp how STIX content customization is detected and enforced enhancement +#503 Revamp how STIX content customization is detected and enforced enhancement #500 fp write for STIX Objects #492 Drop 'six' dependency (backwards breaking) #490 Change canonicalization to normalization From 81550cab92aaacbca5db0d37c607dfd1707ce4c3 Mon Sep 17 00:00:00 2001 From: Chris Lenk Date: Fri, 24 Sep 2021 09:34:37 -0400 Subject: [PATCH 5/5] =?UTF-8?q?Bump=20version:=203.0.0=20=E2=86=92=203.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.cfg | 2 +- stix2/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 94daaca..fdc0c86 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.0.0 +current_version = 3.0.1 commit = True tag = True diff --git a/stix2/version.py b/stix2/version.py index 743140f..5679339 100644 --- a/stix2/version.py +++ b/stix2/version.py @@ -1,3 +1,3 @@ -__version__ = "3.0.0" +__version__ = "3.0.1" DEFAULT_VERSION = '2.1' # Default version will always be the latest STIX 2.X version