diff --git a/plugins/feeds/public/cybercrimetracker.py b/plugins/feeds/public/cybercrimetracker.py index 67014767d..46dd375e7 100644 --- a/plugins/feeds/public/cybercrimetracker.py +++ b/plugins/feeds/public/cybercrimetracker.py @@ -27,7 +27,7 @@ def update(self): pub_date = parser.parse(item['pubDate']) if self.last_run is not None: - if since_last_run > pub_date: + if since_last_run > pub_date.replace(tzinfo=None): continue self.analyze(item, pub_date) diff --git a/plugins/feeds/public/malwaremustdiecncs.py b/plugins/feeds/public/malwaremustdiecncs.py index 955c8d767..ca8969f9d 100644 --- a/plugins/feeds/public/malwaremustdiecncs.py +++ b/plugins/feeds/public/malwaremustdiecncs.py @@ -20,9 +20,16 @@ def update(self): for item in self.update_xml('item', ["title", "description"]): if self.last_run is not None: - if datetime.strptime(item["description"], "%d/%b/%Y") < since_last_run: - continue - + try: + if datetime.strptime(item["description"], "%d/%b/%Y") < since_last_run: + continue + except ValueError: + pass + try: + if datetime.strptime(item["description"], "%d/%B/%Y") < since_last_run: + continue + except ValueError: + raise ValueError("couldn't parse date") self.analyze(item["title"]) def analyze(self, cnc): diff --git a/yeti.conf.sample b/yeti.conf.sample index 09aa8b97b..a41b80494 100644 --- a/yeti.conf.sample +++ b/yeti.conf.sample @@ -82,5 +82,5 @@ # token = [otx] -#otx_key = YourOTXKey -#number_page = 1 \ No newline at end of file +# otx_key = YourOTXKey +# number_page = 1 \ No newline at end of file