From 86bd6f42c0e1a76d75ed9d45229c47ddc9057ffc Mon Sep 17 00:00:00 2001 From: elsif2 Date: Mon, 8 May 2023 15:00:51 +0000 Subject: [PATCH 1/2] Updated to reset report type on reload #2361 --- intelmq/bots/parsers/shadowserver/parser.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/intelmq/bots/parsers/shadowserver/parser.py b/intelmq/bots/parsers/shadowserver/parser.py index 86b4a44b4d..70ba3b4bb6 100644 --- a/intelmq/bots/parsers/shadowserver/parser.py +++ b/intelmq/bots/parsers/shadowserver/parser.py @@ -206,5 +206,8 @@ def parse_line(self, row, report): yield event + def shutdown(self): + self.feedname = None + BOT = ShadowserverParserBot From 74db7d1b558b020eb52560d2c7bf3713dea7cfe0 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Tue, 9 May 2023 10:23:37 +0200 Subject: [PATCH 2/2] doc: add changelog for PR#2361 --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8589e93910..744513200b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,12 +20,14 @@ CHANGELOG #### Collectors #### Parsers +- `intelmq.bots.parsers.shadowserver._config`: + - Reset detected `feedname` at shutdown to re-detect the feedname on reloads (PR#2361 by @elsif2, fixes #2360). - `intelmq.bots.parsers.shadowserver._config`: - Added 'IPv6-Vulnerable-Exchange' alias and 'Accessible-WS-Discovery-Service' report. (PR#2338) - Removed unused 'p0f_genre' and 'p0f_detail' from the 'DNS-Open-Resolvers' report. (PR#2338) - Added 'Accessible-SIP' report. (PR#2348) - Added 'IPv6-Open-HTTP-Proxy' and 'IPv6-Accessible-HTTP-Proxy' aliases. (PR#2348) - - Removed duplicate mappings from the 'Spam-URL' report. (PR#2348) + - Removed duplicate mappings from the 'Spam-URL' report. (PR#2348) #### Experts - `intelmq.bots.experts.sieve`: