style: fix formatting and type checks in remaining files

Author: chenjingen-jane

contrib/eventdb/apply_mapping_eventdb.py

@@ -62,7 +62,7 @@ def eventdb_apply(malware_name_column, malware_family_column, host, port,
                 'WHERE "classification.taxonomy" = \'malicious-code\' {where}'
                 ''.format(table=table, where=where))
     if dry_run:
-        execute = lambda x, y: print(cur.mogrify(x, y).decode())  # noqa: E731
+        def execute(x, y): return print(cur.mogrify(x, y).decode())  # noqa: E731
     else:
         execute = cur.execute
     for (identifier, malware_name) in cur.fetchall():

contrib/eventdb/to_json.py

@@ -14,8 +14,8 @@
 from psycopg2.extras import RealDictCursor
 
 parser = ArgumentParser(
-                    prog='EventDB to JSON',
-                    description='Extract data from the IntelMQ EventDB')
+    prog='EventDB to JSON',
+    description='Extract data from the IntelMQ EventDB')
 parser.add_argument('-v', '--verbose', action='store_true')
 parser.add_argument('-i', '--id', help='Get events by ID')
 parser.add_argument('-p', '--pretty', action='store_true', help='Pretty print JSON output')
@@ -36,7 +36,7 @@
     print(f'Using DSN {conninfo!r}.')
 db = connect(dsn=conninfo)
 cur = db.cursor(cursor_factory=RealDictCursor)
-cur.execute ('SELECT * FROM events WHERE id = %s', (args.id, ))
+cur.execute('SELECT * FROM events WHERE id = %s', (args.id, ))
 
 for row in cur.fetchall():
     del row['id']

contrib/malware_name_mapping/download_mapping.py

@@ -39,7 +39,7 @@ def none_len(arg: Optional[list]):
 
 def generate_rule(expression: str, identifier: str, name=None):
     return {"rulename": name if name else "{}-{}".format(identifier,
-                                                     hashlib.sha1(expression.encode()).hexdigest()[:10]),
+                                                         hashlib.sha1(expression.encode()).hexdigest()[:10]),
             "if": {"classification.taxonomy": "malicious-code",
                    "malware.name": expression
                    },

contrib/systemd/systemd.py

@@ -93,15 +93,14 @@ def main():
         os.makedirs(SYSTEMD_OUTPUT_DIR)
 
     collectors = [i for i in rc_data if rc_data[i]['group'] == 'Collector' and i not in ignored_ids]
-    #parsers = [i for i in pipe_data if rc_data[i]['group'] == 'Parser']
+    # parsers = [i for i in pipe_data if rc_data[i]['group'] == 'Parser']
 
     for bot in collectors:
         bot_data = rc_data[bot]
 
         if DISABLE_IN_CONF:
             rc_data[bot]['enabled'] = False
 
-
         bot_parameters = bot_data['parameters']
         bot_service_name = SERVICE_PREFIX + bot + '.service'
         if bot_data.get('run_mode') == 'continuous' or 'rate_limit' not in bot_parameters:

intelmq/bots/collectors/stomp/collector.py

@@ -22,6 +22,7 @@ class StompListener(stomp.PrintingListener):
         the stomp listener gets called asynchronously for
         every STOMP message
         """
+
         def __init__(self, n6stompcollector, conn, destination, connect_kwargs=None):
             self.stompbot = n6stompcollector
             self.conn = conn

intelmq/bots/parsers/eset/parser.py

@@ -17,6 +17,7 @@
 
 class ESETParserBot(ParserBot):
     """Parse data collected from ESET's TAXII API"""
+
     def init(self):
         self.f_map = {
             'ei.urls (json)': self.urls_parse,

intelmq/bots/parsers/hibp/parser_callback.py

@@ -17,6 +17,7 @@
 
 class HIBPCallbackParserBot(ParserBot):
     """Parse reports of the 'Have I Been Pwned' Callback for Enterprise Subscribers"""
+
     def recover_line(self, line):
         return json.dumps(line, sort_keys=True)
 

intelmq/bots/parsers/malwareurl/parser.py

@@ -31,6 +31,7 @@ def handle_data(self, data):
 
 class MalwareurlParserBot(ParserBot):
     """Parse the MalwareURL feed"""
+
     def process(self):
         report = self.receive_message()
         raw_report = utils.base64_decode(report["raw"])

intelmq/bots/parsers/surbl/parser.py

@@ -9,6 +9,7 @@
 
 class SurblParserBot(ParserBot):
     """Parse the Surbl feed"""
+
     def process(self):
         report = self.receive_message()
         raw_report = utils.base64_decode(report["raw"])  # decoding

intelmq/bots/parsers/threatminer/parser.py

@@ -29,6 +29,7 @@ def process_data(self):
 
 class ThreatminerParserBot(ParserBot):
     """Parse the Threatminer feed"""
+
     def process(self):
         report = self.receive_message()
         raw_report = utils.base64_decode(report["raw"])