Merge pull request #173

Fix check for `--low-priority` flag
tenzir · Nov 22, 2021 · f171cfa · f171cfa
2 parents c188ce1 + 4b9d6ec
commit f171cfa
Show file tree

Hide file tree

Showing 17 changed files with 63 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,12 @@ Every entry has a category for which we use the following visual abbreviations:
 - 🧬 Experimental Features
 - 🐞 Bug Fixes
 
+## [2021.11.22]
+
+- 🐞 `vast-threatbus` no longer fails to check for the availability of low
+  priority queries.
+  [#173](https://github.com/tenzir/threatbus/pull/173)
+
 ## [2021.11.18]
 
 - ⚠️ `vast-threatbus` now issues low priority queries if those are supported by
@@ -265,3 +271,5 @@ Every entry has a category for which we use the following visual abbreviations:
 [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
 [2021.09.30]: https://github.com/tenzir/threatbus/releases/tag/2021.09.30
+[2021.11.18]: https://github.com/tenzir/threatbus/releases/tag/2021.11.18
+[2021.11.22]: https://github.com/tenzir/threatbus/releases/tag/2021.11.22
diff --git a/apps/stix-shifter/CHANGELOG.md b/apps/stix-shifter/CHANGELOG.md
@@ -11,6 +11,10 @@ Every entry has a category for which we use the following visual abbreviations:
 - ⚡️ Breaking Changes
 - 🐞 Bug Fixes
 
+## [2021.11.22]
+
+No user-facing changes.
+
 ## [2021.11.18]
 
 No user-facing changes.
@@ -85,3 +89,4 @@ No user-facing changes.
 [2021.08.26]: https://github.com/tenzir/threatbus/releases/tag/2021.08.26
 [2021.09.30]: https://github.com/tenzir/threatbus/releases/tag/2021.09.30
 [2021.11.18]: https://github.com/tenzir/threatbus/releases/tag/2021.11.18
+[2021.11.22]: https://github.com/tenzir/threatbus/releases/tag/2021.11.22
diff --git a/apps/stix-shifter/setup.py b/apps/stix-shifter/setup.py
@@ -36,7 +36,7 @@
         "stix2 >= 3.0",
         "stix-shifter >= 3.4.2",
         "stix-shifter-utils >= 3.4.2",
-        "threatbus >= 2021.11.18",
+        "threatbus >= 2021.11.22",
     ],
     keywords=[
         "open source",
@@ -54,5 +54,5 @@
     python_requires=">=3.7",
     setup_requires=["setuptools", "wheel"],
     url="https://github.com/tenzir/threatbus",
-    version="2021.11.18",
+    version="2021.11.22",
 )
diff --git a/apps/suricata/CHANGELOG.md b/apps/suricata/CHANGELOG.md
@@ -11,6 +11,10 @@ Every entry has a category for which we use the following visual abbreviations:
 - ⚡️ Breaking Changes
 - 🐞 Bug Fixes
 
+## [2021.11.22]
+
+No user-facing changes.
+
 ## [2021.11.18]
 
 No user-facing changes.
@@ -68,3 +72,4 @@ No user-facing changes.
 [2021.08.26]: https://github.com/tenzir/threatbus/releases/tag/2021.08.26
 [2021.09.30]: https://github.com/tenzir/threatbus/releases/tag/2021.09.30
 [2021.11.18]: https://github.com/tenzir/threatbus/releases/tag/2021.11.18
+[2021.11.22]: https://github.com/tenzir/threatbus/releases/tag/2021.11.22
diff --git a/apps/suricata/setup.py b/apps/suricata/setup.py
@@ -32,7 +32,7 @@
         "pyzmq >= 19",
         "parsuricata",
         "stix2 >= 3.0",
-        "threatbus >= 2021.11.18",
+        "threatbus >= 2021.11.22",
     ],
     keywords=[
         "open source",
@@ -53,5 +53,5 @@
     python_requires=">=3.7",
     setup_requires=["setuptools", "wheel"],
     url="https://github.com/tenzir/threatbus",
-    version="2021.11.18",
+    version="2021.11.22",
 )
diff --git a/apps/vast/CHANGELOG.md b/apps/vast/CHANGELOG.md
@@ -10,6 +10,18 @@ Every entry has a category for which we use the following visual abbreviations:
 - ⚡️ Breaking Changes
 - 🐞 Bug Fixes
 
+## [2021.11.22]
+
+- 🐞 `vast-threatbus` no longer fails to check for the availability of low
+  priority queries.
+  [#173](https://github.com/tenzir/threatbus/pull/173)
+
+## [2021.11.18]
+
+- ⚠️ `vast-threatbus` now issues low priority queries if those are supported by
+  the version of VAST.
+  [#171](https://github.com/tenzir/threatbus/pull/171)
+
 ## [2021.09.30]
 
 No user-facing changes.
@@ -214,3 +226,5 @@ No user-facing changes.
 [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
 [2021.09.30]: https://github.com/tenzir/threatbus/releases/tag/2021.09.30
+[2021.11.18]: https://github.com/tenzir/threatbus/releases/tag/2021.11.18
+[2021.11.22]: https://github.com/tenzir/threatbus/releases/tag/2021.11.22
diff --git a/apps/vast/setup.py b/apps/vast/setup.py
@@ -33,7 +33,7 @@
         "pyzmq >= 19",
         "pyvast >= 2021.6.24",
         "stix2 >= 3.0",
-        "threatbus >= 2021.11.18",
+        "threatbus >= 2021.11.22",
     ],
     keywords=[
         "open source",
@@ -52,5 +52,5 @@
     python_requires=">=3.7",
     setup_requires=["setuptools", "wheel"],
     url="https://github.com/tenzir/threatbus",
-    version="2021.11.18",
+    version="2021.11.22",
 )
diff --git a/apps/vast/vast_threatbus/vast_threatbus.py b/apps/vast/vast_threatbus/vast_threatbus.py
@@ -135,8 +135,13 @@ async def check_low_priority_support(vast: VAST):
     """
     Checks whether the export command supports the `--low-priority` option.
     """
-    helpmsg = await vast.export(help=True).exec()
-    return "--low-priority" in helpmsg
+    proc = await vast.export(help=True).exec()
+    await proc.wait()
+    if proc.returncode != 0:
+        return False
+    stdout, _ = await proc.communicate()
+    print(str(stdout), file=sys.stderr)
+    return "--low-priority" in str(stdout)
 
 
 async def start(
@@ -359,7 +364,7 @@ async def retro_match_vast(
         vast = VAST(binary=vast_binary, endpoint=vast_endpoint, logger=logger)
         kwargs = {}
         if low_priority_support:
-            kwargs["low-priority"] = True
+            kwargs["low_priority"] = True
         if retro_match_max_events > 0:
             kwargs["max_events"] = retro_match_max_events
         proc = await vast.export(**kwargs).json(query).exec()

diff --git a/apps/zmq-app-template/setup.py b/apps/zmq-app-template/setup.py
@@ -31,7 +31,7 @@
         "dynaconf >= 3.1.4",
         "pyzmq >= 19",
         "stix2 >= 3.0",
-        "threatbus >= 2021.11.18",
+        "threatbus >= 2021.11.22",
     ],
     keywords=[
         "open source",
@@ -49,5 +49,5 @@
     python_requires=">=3.7",
     setup_requires=["setuptools", "wheel"],
     url="https://github.com/tenzir/threatbus",
-    version="2021.11.18",
+    version="2021.11.22",
 )
diff --git a/plugins/apps/threatbus_cif3/setup.py b/plugins/apps/threatbus_cif3/setup.py
@@ -27,7 +27,7 @@
     entry_points={"threatbus.app": ["cif3 = threatbus_cif3.plugin"]},
     install_requires=[
         "stix2 >= 3.0",
-        "threatbus >= 2021.11.18",
+        "threatbus >= 2021.11.22",
         "cifsdk > 3.0.0rc4, < 4.0",
     ],
     keywords=[
@@ -49,5 +49,5 @@
     packages=["threatbus_cif3"],
     python_requires=">=3.6",
     url="https://github.com/tenzir/threatbus",
-    version="2021.11.18",
+    version="2021.11.22",
 )
diff --git a/plugins/apps/threatbus_misp/setup.py b/plugins/apps/threatbus_misp/setup.py
@@ -28,7 +28,7 @@
     install_requires=[
         "pymisp >= 2.4.120",
         "stix2 >= 3.0",
-        "threatbus >= 2021.11.18",
+        "threatbus >= 2021.11.22",
     ],
     extras_require={"kafka": ["confluent-kafka>=1.3.0"], "zmq": ["pyzmq>=18.1.1"]},
     keywords=[
@@ -49,5 +49,5 @@
     packages=["threatbus_misp"],
     python_requires=">=3.7",
     url="https://github.com/tenzir/threatbus",
-    version="2021.11.18",
+    version="2021.11.22",
 )
diff --git a/plugins/apps/threatbus_zeek/setup.py b/plugins/apps/threatbus_zeek/setup.py
@@ -27,7 +27,7 @@
     entry_points={"threatbus.app": ["zeek = threatbus_zeek.plugin"]},
     install_requires=[
         "stix2 >= 3.0",
-        "threatbus >= 2021.11.18",
+        "threatbus >= 2021.11.22",
     ],
     keywords=[
         "Zeek",
@@ -50,5 +50,5 @@
     python_requires=">=3.7",
     setup_requires=["setuptools", "wheel"],
     url="https://github.com/tenzir/threatbus",
-    version="2021.11.18",
+    version="2021.11.22",
 )
diff --git a/plugins/apps/threatbus_zmq/setup.py b/plugins/apps/threatbus_zmq/setup.py
@@ -29,7 +29,7 @@
         "pyzmq>=19",
         "python-dateutil>=2.8.1",
         "stix2>=3.0",
-        "threatbus>=2021.11.18",
+        "threatbus>=2021.11.22",
     ],
     keywords=[
         "zeromq",
@@ -47,5 +47,5 @@
     packages=["threatbus_zmq"],
     python_requires=">=3.7",
     url="https://github.com/tenzir/threatbus",
-    version="2021.11.18",
+    version="2021.11.22",
 )
diff --git a/plugins/backbones/file_benchmark/setup.py b/plugins/backbones/file_benchmark/setup.py
@@ -24,7 +24,7 @@
     entry_points={"threatbus.backbone": ["file_benchmark = file_benchmark.plugin"]},
     install_requires=[
         "stix2 >= 3.0",
-        "threatbus >= 2021.11.18",
+        "threatbus >= 2021.11.22",
     ],
     keywords=["threatbus", "plugin"],
     license="BSD 3-clause",
@@ -34,5 +34,5 @@
     packages=["file_benchmark"],
     python_requires=">=3.7",
     url="https://github.com/tenzir/threatbus",
-    version="2021.11.18",
+    version="2021.11.22",
 )
diff --git a/plugins/backbones/threatbus_inmem/setup.py b/plugins/backbones/threatbus_inmem/setup.py
@@ -24,7 +24,7 @@
     entry_points={"threatbus.backbone": ["inmem = threatbus_inmem.plugin"]},
     install_requires=[
         "stix2 >= 3.0",
-        "threatbus >= 2021.11.18",
+        "threatbus >= 2021.11.22",
     ],
     keywords=[
         "message broker",
@@ -41,5 +41,5 @@
     packages=["threatbus_inmem"],
     python_requires=">=3.7",
     url="https://github.com/tenzir/threatbus",
-    version="2021.11.18",
+    version="2021.11.22",
 )
diff --git a/plugins/backbones/threatbus_rabbitmq/setup.py b/plugins/backbones/threatbus_rabbitmq/setup.py
@@ -26,7 +26,7 @@
         "pika >= 1.1.0",
         "retry",
         "stix2 >= 3.0",
-        "threatbus >= 2021.11.18",
+        "threatbus >= 2021.11.22",
     ],
     keywords=[
         "message broker",
@@ -46,5 +46,5 @@
     packages=["threatbus_rabbitmq"],
     python_requires=">=3.7",
     url="https://github.com/tenzir/threatbus",
-    version="2021.11.18",
+    version="2021.11.22",
 )
diff --git 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.11.18",
+    version="2021.11.22",
 )