Skip to content

Commit

Permalink
Merge pull request #2523 from sebix/fix-2521
Browse files Browse the repository at this point in the history
Shadowserver: Fix parameter 'reports' behaviour if empty string
  • Loading branch information
sebix committed Sep 3, 2024
2 parents a9f6c6e + b322bc5 commit 51077a5
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions intelmq/bots/collectors/shadowserver/collector_reports_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ShadowServerAPICollectorBot(CollectorBot, HttpMixin, CacheMixin):
Parameters:
api_key (str): Your Shadowserver API key
secret (str): Your Shadowserver API secret
country (str): DEPRECIATED The mailing list you want to download reports for (i.e. 'austria')
country (str): DEPRECATED The mailing list you want to download reports for (i.e. 'austria')
reports (list):
A list of strings or a comma-separated list of the mailing lists you want to process.
types (list):
Expand All @@ -56,7 +56,9 @@ def init(self):
raise ValueError('No secret provided.')

if isinstance(self.reports, str):
self._report_list = self.reports.split(',')
# if reports is an empty string (or only contains whitespace), behave as if the parameter is not set and select all reports
reports = self.reports.strip()
self._report_list = reports.split(',') if reports else []
elif isinstance(self.reports, list):
self._report_list = self.reports
if isinstance(self.types, str):
Expand Down

0 comments on commit 51077a5

Please sign in to comment.