diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bc8d47b3..a507edd43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ - `intelmq.bots.collectors.shadowserver.collector_reports_api.py`: - Added support for the types parameter to be either a string or a list. - Refactored to utilize the type field returned by the API to match the requested types instead of a sub-string match on the filename. + - Fixed timezone issue for collecting reports. - `intelmq.bots.collectors.shodan.collector_stream` (PR#2492 by Mikk Margus Möll): - Add `alert` parameter to Shodan stream collector to allow fetching streams by configured alert ID diff --git a/intelmq/bots/collectors/shadowserver/collector_reports_api.py b/intelmq/bots/collectors/shadowserver/collector_reports_api.py index 46bee139d..09ca86f36 100644 --- a/intelmq/bots/collectors/shadowserver/collector_reports_api.py +++ b/intelmq/bots/collectors/shadowserver/collector_reports_api.py @@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2020 Intelmq Team SPDX-License-Identifier: AGPL-3.0-or-later """ -from datetime import datetime, timedelta +from datetime import datetime, timedelta, timezone import json import hashlib import hmac @@ -89,12 +89,11 @@ def _reports_list(self, date=None): again. """ if date is None: - date = datetime.today().date() - daybefore = date - timedelta(2) - dayafter = date + timedelta(1) + date = datetime.now(timezone.utc).date() + begin = date - timedelta(2) data = self.preamble - data += f',"date": "{daybefore.isoformat()}:{dayafter.isoformat()}" ' + data += f',"date": "{begin.isoformat()}:{date.isoformat()}" ' if len(self._report_list) > 0: data += f',"reports": {json.dumps(self._report_list)}' data += '}'