Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into main

Fix transformation from Filter object to TAXII filter

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

README.rst

@@ -68,8 +68,8 @@ For more in-depth documentation, please see `https://stix2.readthedocs.io/ <http
 STIX 2 Technical Specification Support
 --------------------------------------
 
-This version of cti-python-stix2 brings support to `STIX Version 2.1 <https://docs.oasis-open.org/cti/stix/v2.1/cs02/stix-v2.1-cs02.html>`__
-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 <https://docs.oasis-open.org/cti/stix/v2.1/os/stix-v2.1-os.html>`__
+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

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.0.0
+current_version = 3.0.1
 commit = True
 tag = True
 

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',

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", "<any op>", "indicator,sighting")
-            Filter("type", "<any op>", ["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

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