BUG: mail url collector: handle empty download

fixes #988
certtools · May 14, 2018 · 3b0c336 · 3b0c336
1 parent 81163d5
commit 3b0c336
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG
 
 ### Bots
 #### Collectors
+- `bots.collectors.mail.collector_mail_url`: handle empty downloaded reports (#988).
 
 #### Parsers
 - Shadowserver parser:

diff --git a/intelmq/bots/collectors/mail/collector_mail_url.py b/intelmq/bots/collectors/mail/collector_mail_url.py
@@ -82,15 +82,17 @@ def process(self):
                         if resp.status_code // 100 != 2:
                             raise ValueError('HTTP response status code was {}.'
                                              ''.format(resp.status_code))
+                        if not resp.content:
+                            self.logger.warning('Got empty reponse from server.')
+                        else:
+                            self.logger.info("Report downloaded.")
 
-                        self.logger.info("Report downloaded.")
+                            template = self.new_report()
 
-                        template = self.new_report()
-
-                        for report in generate_reports(template, io.BytesIO(resp.content),
-                                                       self.chunk_size,
-                                                       self.chunk_replicate_header):
-                            self.send_message(report)
+                            for report in generate_reports(template, io.BytesIO(resp.content),
+                                                           self.chunk_size,
+                                                           self.chunk_replicate_header):
+                                self.send_message(report)
 
                         # Only mark read if message relevant to this instance,
                         # so other instances watching this mailbox will still