Merge pull request #536 from YuningMiao/master

bugfix for cybercrimetracker

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)

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):

yeti.conf.sample

@@ -82,5 +82,5 @@
 # token =
 
 [otx]
-#otx_key = YourOTXKey
-#number_page = 1
+# otx_key = YourOTXKey
+# number_page = 1