From b789475fa84ea4b3ba19e8d8f61d5327d552b60e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Pokorn=C3=BD?= Date: Tue, 8 Nov 2022 18:17:09 +0100 Subject: [PATCH 1/2] DOCS: Updates documentation for sieve expert bot. --- docs/user/bots.rst | 2 +- setup.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/user/bots.rst b/docs/user/bots.rst index 8d1fb2752..60d4146b7 100644 --- a/docs/user/bots.rst +++ b/docs/user/bots.rst @@ -2894,7 +2894,7 @@ format: path 'other-path' // the message is sent to the given path } - if classification.type == ['phishing', 'malware-distribution'] && source.fqdn =~ '.*\.(ch|li)$' { + if classification.type :in ['phishing', 'malware-distribution'] && source.fqdn =~ '.*\.(ch|li)$' { add! comment = 'domainabuse' keep } elif classification.type == 'scanner' { diff --git a/setup.py b/setup.py index 1611d8c46..25a0024e6 100644 --- a/setup.py +++ b/setup.py @@ -90,7 +90,6 @@ 'intelmqctl = intelmq.bin.intelmqctl:main', 'intelmqdump = intelmq.bin.intelmqdump:main', 'intelmq_psql_initdb = intelmq.bin.intelmq_psql_initdb:main', - 'intelmq.bots.experts.sieve.validator = intelmq.bots.experts.sieve.validator:main', 'intelmqsetup = intelmq.bin.intelmqsetup:main', ] + BOTS, }, From 3239df8a36d1d71a27ee6c7ff97801464dd19b49 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 9 Nov 2022 09:49:35 +0100 Subject: [PATCH 2/2] doc: add changelog for PR#2256 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d16c44c7..368a6a742 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -112,8 +112,10 @@ CHANGELOG - Feeds: Add documentation for newly supported dataplane feeds, see above (PR#2102 by Mikk Margus Möll). - Installation: Restructured the whole document to make it clearer and straight-forward (PR#2113 by Sebastian Wagner). - Add workaround for https://github.com/sphinx-doc/sphinx/issues/10701 (PR#2225 by Sebastian Wagner, kudos @yarikoptic, fixes #2224). +- Fix wrong operator for list-contains-value operation in sieve expert documentation (PR#2256 by Filip Pokorný). ### Packaging +- Remove deleted `intelmq.bots.experts.sieve.validator` from executables in `setup.py` (PR#2256 by Filip Pokorný). ### Tests - Add GitHub Action to run regexploit on all Python, JSON and YAML files (PR#2059 by Sebastian Wagner).