From 2cc2642e0d56cc0ac8ce552c60d64833afc1139e Mon Sep 17 00:00:00 2001 From: elsif2 Date: Thu, 18 Apr 2024 15:14:34 +0000 Subject: [PATCH] Handle type parameter as a string and match by type instead of filename substring. --- .../bots/collectors/shadowserver/collector_reports_api.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/intelmq/bots/collectors/shadowserver/collector_reports_api.py b/intelmq/bots/collectors/shadowserver/collector_reports_api.py index 67fade269..46bee139d 100644 --- a/intelmq/bots/collectors/shadowserver/collector_reports_api.py +++ b/intelmq/bots/collectors/shadowserver/collector_reports_api.py @@ -59,7 +59,8 @@ def init(self): self._report_list = self.reports.split(',') elif isinstance(self.reports, list): self._report_list = self.reports - + if isinstance(self.types, str): + self.types = self.types.split(',') if self.country and self.country not in self._report_list: self.logger.warn("Deprecated parameter 'country' found. Please use 'reports' instead. The backwards-compatibility will be removed in IntelMQ version 4.0.0.") self._report_list.append(self.country) @@ -110,8 +111,7 @@ def _reports_list(self, date=None): return None if self.types: - reports = [report for report in reports if any(rtype in report['file'] for rtype in self.types)] - + reports = [report for report in reports if any(report['type'] == rtype for rtype in self.types)] return reports def _report_download(self, reportid: str):