From 5b94e1474341659fea53041facc413523c18db05 Mon Sep 17 00:00:00 2001 From: Benno Evers Date: Fri, 27 Aug 2021 10:34:26 +0200 Subject: [PATCH 1/4] Bump VAST dependency in Dockerfile --- docker/vast-threatbus/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/vast-threatbus/Dockerfile b/docker/vast-threatbus/Dockerfile index c9b82e56..fc5b13f7 100644 --- a/docker/vast-threatbus/Dockerfile +++ b/docker/vast-threatbus/Dockerfile @@ -1,7 +1,7 @@ # The used version here always refers to the latest released VAST version. # Use `latest` to get the most recent version of VAST as it is available on the # Git master branch at https://github.com/tenzir/vast. -ARG VAST_VERSION=2021.07.29 +ARG VAST_VERSION=2021.08.26 FROM tenzir/vast:$VAST_VERSION USER root From a2117e0d72b5d347b269384eb82f56bbf6e023a9 Mon Sep 17 00:00:00 2001 From: Benno Evers Date: Fri, 27 Aug 2021 10:44:54 +0200 Subject: [PATCH 2/4] Rotate CHANGELOGs for August Release --- CHANGELOG.md | 6 +++++- apps/stix-shifter/CHANGELOG.md | 6 ++++++ apps/suricata/CHANGELOG.md | 6 ++++++ apps/vast/CHANGELOG.md | 6 +++++- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2003ed9c..9716bcf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ Every entry has a category for which we use the following visual abbreviations: - 🧬 Experimental Features - 🐞 Bug Fixes -## Unreleased +## [2021.08.26] - ⚡️ The `threatbus-zmq-app` package has been renamed to `threatbus-zmq`, to address some limitations in the configuration framework. @@ -19,6 +19,9 @@ Every entry has a category for which we use the following visual abbreviations: - 🐞 Fixed config validation for the 'apps.misp.api' setting. [#161](https://github.com/tenzir/threatbus/pull/161) +- ⚠️ `vast-threatbus` now depends on version 3.0 of `stix2` package. + [#162](https://github.com/tenzir/threatbus/pull/162) + ## [2021.07.29] - 🐞 Threatbus now only attempts to load plugins that are explicitly @@ -250,3 +253,4 @@ Every entry has a category for which we use the following visual abbreviations: [2021.05.27]: https://github.com/tenzir/threatbus/releases/tag/2021.05.27 [2021.06.24]: https://github.com/tenzir/threatbus/releases/tag/2021.06.24 [2021.07.29]: https://github.com/tenzir/threatbus/releases/tag/2021.07.29 +[2021.08.26]: https://github.com/tenzir/threatbus/releases/tag/2021.08.26 diff --git a/apps/stix-shifter/CHANGELOG.md b/apps/stix-shifter/CHANGELOG.md index e60e387e..d1448648 100644 --- a/apps/stix-shifter/CHANGELOG.md +++ b/apps/stix-shifter/CHANGELOG.md @@ -11,6 +11,11 @@ Every entry has a category for which we use the following visual abbreviations: - ⚡️ Breaking Changes - 🐞 Bug Fixes +## [2021.08.26] + +- ⚠️ `stix-shifter-threatbus` now depends on version 3.0 of `stix2` package. + [#162](https://github.com/tenzir/threatbus/pull/162) + ## [2021.07.29] - ⚠️ The Dockerfile of `stix-shifter-threatbus` has moved to the repository @@ -69,3 +74,4 @@ Every entry has a category for which we use the following visual abbreviations: [2021.05.27]: https://github.com/tenzir/threatbus/releases/tag/2021.05.27 [2021.06.24]: https://github.com/tenzir/threatbus/releases/tag/2021.06.24 [2021.07.29]: https://github.com/tenzir/threatbus/releases/tag/2021.07.29 +[2021.08.26]: https://github.com/tenzir/threatbus/releases/tag/2021.08.26 diff --git a/apps/suricata/CHANGELOG.md b/apps/suricata/CHANGELOG.md index e474d5c8..d5e6880c 100644 --- a/apps/suricata/CHANGELOG.md +++ b/apps/suricata/CHANGELOG.md @@ -11,6 +11,11 @@ Every entry has a category for which we use the following visual abbreviations: - ⚡️ Breaking Changes - 🐞 Bug Fixes +## [2021.08.26] + +- ⚠️ `suricata-threatbus` now depends on version 3.0 of `stix2` package. + [#162](https://github.com/tenzir/threatbus/pull/162) + ## [2021.07.29] - ⚠️ The Dockerfile of `suricata-threatbus` has moved to the repository toplevel @@ -52,3 +57,4 @@ Every entry has a category for which we use the following visual abbreviations: [2021.06.24]: https://github.com/tenzir/threatbus/releases/tag/2021.06.24 [2021.07.29]: https://github.com/tenzir/threatbus/releases/tag/2021.07.29 +[2021.08.26]: https://github.com/tenzir/threatbus/releases/tag/2021.08.26 diff --git a/apps/vast/CHANGELOG.md b/apps/vast/CHANGELOG.md index d06a39c0..2c02354c 100644 --- a/apps/vast/CHANGELOG.md +++ b/apps/vast/CHANGELOG.md @@ -10,7 +10,7 @@ Every entry has a category for which we use the following visual abbreviations: - ⚡️ Breaking Changes - 🐞 Bug Fixes -## Unreleased +## [2021.08.26] - ⚡️ We renamed PyVAST Threat Bus to VAST Threat Bus for clarity. The PyPI package name and the binary name change from `pyvast-threatbus` to @@ -20,6 +20,9 @@ Every entry has a category for which we use the following visual abbreviations: - 🎁 Live matching with VAST works again! [#156](https://github.com/tenzir/threatbus/pull/156) +- ⚠️ `vast-threatbus` now depends on version 3.0 of `stix2` package. + [#162](https://github.com/tenzir/threatbus/pull/162) + ## [2021.07.29] - ⚠️ The metric for indicator query time now only reflects the actual time spent @@ -205,3 +208,4 @@ Every entry has a category for which we use the following visual abbreviations: [2021.05.27]: https://github.com/tenzir/threatbus/releases/tag/2021.05.27 [2021.06.24]: https://github.com/tenzir/threatbus/releases/tag/2021.06.24 [2021.07.29]: https://github.com/tenzir/threatbus/releases/tag/2021.07.29 +[2021.08.26]: https://github.com/tenzir/threatbus/releases/tag/2021.08.26 From 6521e580b76559ae56952e8967757e6dee290a0a Mon Sep 17 00:00:00 2001 From: Benno Evers Date: Fri, 27 Aug 2021 10:47:12 +0200 Subject: [PATCH 3/4] Bump all versions for August release --- apps/stix-shifter/setup.py | 2 +- apps/suricata/setup.py | 2 +- apps/vast/setup.py | 2 +- apps/zmq-app-template/setup.py | 2 +- plugins/apps/threatbus_cif3/setup.py | 2 +- plugins/apps/threatbus_misp/setup.py | 2 +- plugins/apps/threatbus_zeek/setup.py | 2 +- plugins/apps/threatbus_zmq/setup.py | 2 +- plugins/backbones/file_benchmark/setup.py | 2 +- plugins/backbones/threatbus_inmem/setup.py | 2 +- plugins/backbones/threatbus_rabbitmq/setup.py | 2 +- setup.py | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/stix-shifter/setup.py b/apps/stix-shifter/setup.py index 20a823d7..0fc220d4 100644 --- a/apps/stix-shifter/setup.py +++ b/apps/stix-shifter/setup.py @@ -54,5 +54,5 @@ python_requires=">=3.7", setup_requires=["setuptools", "wheel"], url="https://github.com/tenzir/threatbus", - version="2021.07.29", + version="2021.08.26", ) diff --git a/apps/suricata/setup.py b/apps/suricata/setup.py index 130f392e..a3368320 100644 --- a/apps/suricata/setup.py +++ b/apps/suricata/setup.py @@ -53,5 +53,5 @@ python_requires=">=3.7", setup_requires=["setuptools", "wheel"], url="https://github.com/tenzir/threatbus", - version="2021.07.29", + version="2021.08.26", ) diff --git a/apps/vast/setup.py b/apps/vast/setup.py index 4a482fbe..89afb92b 100644 --- a/apps/vast/setup.py +++ b/apps/vast/setup.py @@ -52,5 +52,5 @@ python_requires=">=3.7", setup_requires=["setuptools", "wheel"], url="https://github.com/tenzir/threatbus", - version="2021.07.29", + version="2021.08.26", ) diff --git a/apps/zmq-app-template/setup.py b/apps/zmq-app-template/setup.py index 66024c10..21ad611f 100644 --- a/apps/zmq-app-template/setup.py +++ b/apps/zmq-app-template/setup.py @@ -49,5 +49,5 @@ python_requires=">=3.7", setup_requires=["setuptools", "wheel"], url="https://github.com/tenzir/threatbus", - version="2021.07.29", + version="2021.08.26", ) diff --git a/plugins/apps/threatbus_cif3/setup.py b/plugins/apps/threatbus_cif3/setup.py index 2b3250c8..8baeb88f 100644 --- a/plugins/apps/threatbus_cif3/setup.py +++ b/plugins/apps/threatbus_cif3/setup.py @@ -49,5 +49,5 @@ packages=["threatbus_cif3"], python_requires=">=3.6", url="https://github.com/tenzir/threatbus", - version="2021.07.29", + version="2021.08.26", ) diff --git a/plugins/apps/threatbus_misp/setup.py b/plugins/apps/threatbus_misp/setup.py index 6b291680..37a7c62d 100644 --- a/plugins/apps/threatbus_misp/setup.py +++ b/plugins/apps/threatbus_misp/setup.py @@ -49,5 +49,5 @@ packages=["threatbus_misp"], python_requires=">=3.7", url="https://github.com/tenzir/threatbus", - version="2021.07.29", + version="2021.08.26", ) diff --git a/plugins/apps/threatbus_zeek/setup.py b/plugins/apps/threatbus_zeek/setup.py index f502085c..c0c2de08 100644 --- a/plugins/apps/threatbus_zeek/setup.py +++ b/plugins/apps/threatbus_zeek/setup.py @@ -50,5 +50,5 @@ python_requires=">=3.7", setup_requires=["setuptools", "wheel"], url="https://github.com/tenzir/threatbus", - version="2021.07.29", + version="2021.08.26", ) diff --git a/plugins/apps/threatbus_zmq/setup.py b/plugins/apps/threatbus_zmq/setup.py index aec1e292..cec66c18 100644 --- a/plugins/apps/threatbus_zmq/setup.py +++ b/plugins/apps/threatbus_zmq/setup.py @@ -47,5 +47,5 @@ packages=["threatbus_zmq"], python_requires=">=3.7", url="https://github.com/tenzir/threatbus", - version="2021.07.29", + version="2021.08.26", ) diff --git a/plugins/backbones/file_benchmark/setup.py b/plugins/backbones/file_benchmark/setup.py index 5df8f1d8..3af44c47 100644 --- a/plugins/backbones/file_benchmark/setup.py +++ b/plugins/backbones/file_benchmark/setup.py @@ -34,5 +34,5 @@ packages=["file_benchmark"], python_requires=">=3.7", url="https://github.com/tenzir/threatbus", - version="2021.07.29", + version="2021.08.26", ) diff --git a/plugins/backbones/threatbus_inmem/setup.py b/plugins/backbones/threatbus_inmem/setup.py index 78fd37d6..e6697519 100644 --- a/plugins/backbones/threatbus_inmem/setup.py +++ b/plugins/backbones/threatbus_inmem/setup.py @@ -41,5 +41,5 @@ packages=["threatbus_inmem"], python_requires=">=3.7", url="https://github.com/tenzir/threatbus", - version="2021.07.29", + version="2021.08.26", ) diff --git a/plugins/backbones/threatbus_rabbitmq/setup.py b/plugins/backbones/threatbus_rabbitmq/setup.py index 14034371..ff06aa4e 100644 --- a/plugins/backbones/threatbus_rabbitmq/setup.py +++ b/plugins/backbones/threatbus_rabbitmq/setup.py @@ -46,5 +46,5 @@ packages=["threatbus_rabbitmq"], python_requires=">=3.7", url="https://github.com/tenzir/threatbus", - version="2021.07.29", + version="2021.08.26", ) diff --git a/setup.py b/setup.py index 3b7ec136..41e0f8b2 100644 --- a/setup.py +++ b/setup.py @@ -49,5 +49,5 @@ python_requires=">=3.7", setup_requires=["setuptools", "wheel"], url="https://github.com/tenzir/threatbus", - version="2021.07.29", + version="2021.08.26", ) From 6f0d9abc3c7091ef72ea03354d9c38f602eac703 Mon Sep 17 00:00:00 2001 From: Benno Evers Date: Fri, 27 Aug 2021 10:54:45 +0200 Subject: [PATCH 4/4] Pin pluggy to < 1.0 to avoid breaking changes --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index f59b7d93..3706dc9e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ black>=19.10b coloredlogs>=10.0 dynaconf>=3.1.4 -pluggy>=0.13 +pluggy>=0.13,<1.0 python-dateutil>=2.8.1 stix2-patterns == 1.3.0 stix2>=3.0 diff --git a/setup.py b/setup.py index 41e0f8b2..f9bdcad9 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ "black>=19.10b", "coloredlogs>=10.0", "dynaconf>=3.1.4", - "pluggy>=0.13", + "pluggy>=0.13,<1.0", "python-dateutil>=2.8.1", "stix2-patterns == 1.3.0", "stix2>=2.1,<3.0",