Merge pull request #2494 from kamil-certat/handle_current_event_fail

FIX: handle init failure on incorrect current event
certtools · May 5, 2024 · 861a202 · 861a202
2 parents bc941c6 + ea0df0d
commit 861a202
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,6 +33,7 @@
 #### Experts
 
 #### Outputs
+- `intelmq.bots.outputs.misp.output_feed`: handle failures if saved current event wasn't saved or is incorrect (PR by Kamil Mankowski).
 
 ### Documentation
 

diff --git a/intelmq/bots/outputs/misp/output_feed.py b/intelmq/bots/outputs/misp/output_feed.py
@@ -68,21 +68,25 @@ def init(self):
             self.timedelta = datetime.timedelta(minutes=parse_relative(self.interval_event))
 
         if (self.output_dir / '.current').exists():
-            with (self.output_dir / '.current').open() as f:
-                self.current_file = Path(f.read())
-            self.current_event = MISPEvent()
-            self.current_event.load_file(self.current_file)
-
-            last_min_time, last_max_time = re.findall('IntelMQ event (.*) - (.*)', self.current_event.info)[0]
-            last_min_time = datetime.datetime.strptime(last_min_time, '%Y-%m-%dT%H:%M:%S.%f')
-            last_max_time = datetime.datetime.strptime(last_max_time, '%Y-%m-%dT%H:%M:%S.%f')
-            if last_max_time < datetime.datetime.now():
-                self.min_time_current = datetime.datetime.now()
-                self.max_time_current = self.min_time_current + self.timedelta
+            try:
+                with (self.output_dir / '.current').open() as f:
+                    self.current_file = Path(f.read())
+                self.current_event = MISPEvent()
+                self.current_event.load_file(self.current_file)
+
+                last_min_time, last_max_time = re.findall('IntelMQ event (.*) - (.*)', self.current_event.info)[0]
+                last_min_time = datetime.datetime.strptime(last_min_time, '%Y-%m-%dT%H:%M:%S.%f')
+                last_max_time = datetime.datetime.strptime(last_max_time, '%Y-%m-%dT%H:%M:%S.%f')
+                if last_max_time < datetime.datetime.now():
+                    self.min_time_current = datetime.datetime.now()
+                    self.max_time_current = self.min_time_current + self.timedelta
+                    self.current_event = None
+                else:
+                    self.min_time_current = last_min_time
+                    self.max_time_current = last_max_time
+            except:
+                self.logger.exception("Loading current event %s failed. Skipping it.", self.current_event)
                 self.current_event = None
-            else:
-                self.min_time_current = last_min_time
-                self.max_time_current = last_max_time
         else:
             self.min_time_current = datetime.datetime.now()
             self.max_time_current = self.min_time_current + self.timedelta