Merge pull request #2459 from gethvi/fix-shadowserver-fixed-report-type

Fix Shadowserver parser fixed report type.
certtools · Feb 5, 2024 · 7085de1 · 7085de1
2 parents 51994d1 + 2ec8227
commit 7085de1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/intelmq/bots/parsers/shadowserver/_config.py b/intelmq/bots/parsers/shadowserver/_config.py
@@ -126,7 +126,7 @@ def enable_auto_update(enable):
     __config.auto_update = enable
 
 
-def get_feed_by_feedname(given_feedname: str) -> Optional[Dict[str, Any]]:
+def get_feed_by_feedname(given_feedname: str) -> Optional[Tuple[str, Dict[str, Any]]]:
     return __config.feedname_mapping.get(given_feedname, None)
 
 

diff --git a/intelmq/bots/parsers/shadowserver/parser.py b/intelmq/bots/parsers/shadowserver/parser.py
@@ -63,6 +63,7 @@ def init(self):
         if self.feedname is not None:
             self._sparser_config = config.get_feed_by_feedname(self.feedname)
             if self._sparser_config:
+                self._sparser_config = self._sparser_config[1]
                 self.logger.info('Using fixed feed name %r for parsing reports.' % self.feedname)
                 self._mode = 'fixed'
             else: