Original PR domainaware#522 domainaware#510 domainaware#504

mkilijanek · May 7, 2024 · e101974 · e101974
1 parent 11a9e95
commit e101974
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/parsedmarc/cli.py b/parsedmarc/cli.py
@@ -845,35 +845,27 @@ def process_reports(reports_):
                 exit(-1)
             if "user" in kafka_config:
                 opts.kafka_username = kafka_config["user"]
-            else:
-                logger.critical("user setting missing from the "
-                                "kafka config section")
-                exit(-1)
             if "password" in kafka_config:
                 opts.kafka_password = kafka_config["password"]
-            else:
-                logger.critical("password setting missing from the "
-                                "kafka config section")
-                exit(-1)
             if "ssl" in kafka_config:
                 opts.kafka_ssl = kafka_config.getboolean("ssl")
             if "skip_certificate_verification" in kafka_config:
                 kafka_verify = kafka_config.getboolean(
                     "skip_certificate_verification")
                 opts.kafka_skip_certificate_verification = kafka_verify
             if "aggregate_topic" in kafka_config:
-                opts.kafka_aggregate = kafka_config["aggregate_topic"]
+                opts.kafka_aggregate_topic = kafka_config["aggregate_topic"]
             else:
                 logger.critical("aggregate_topic setting missing from the "
                                 "kafka config section")
                 exit(-1)
             if "forensic_topic" in kafka_config:
-                opts.kafka_username = kafka_config["forensic_topic"]
+                opts.kafka_forensic_topic = kafka_config["forensic_topic"]
             else:
                 logger.critical("forensic_topic setting missing from the "
                                 "kafka config section")
             if "smtp_tls_topic" in kafka_config:
-                opts.kafka_username = kafka_config["smtp_tls_topic"]
+                opts.kafka_smtp_tls_topic = kafka_config["smtp_tls_topic"]
             else:
                 logger.critical("forensic_topic setting missing from the "
                                 "splunk_hec config section")

diff --git a/parsedmarc/syslog.py b/parsedmarc/syslog.py
@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 
 import logging
-import logging.handlers
 import json
+import socket
 
 from parsedmarc import parsed_aggregate_reports_to_csv_rows, \
     parsed_forensic_reports_to_csv_rows, parsed_smtp_tls_reports_to_csv_rows
+from syslog2 import SysLogHandler
 
 
 class SyslogClient(object):
@@ -22,8 +23,7 @@ def __init__(self, server_name, server_port):
         self.server_port = server_port
         self.logger = logging.getLogger('parsedmarc_syslog')
         self.logger.setLevel(logging.INFO)
-        log_handler = logging.handlers.SysLogHandler(address=(server_name,
-                                                              server_port))
+        log_handler = SysLogHandler(address=(server_name, server_port), format='rfc3164', socktype=socket.SOCK_DGRAM)
         self.logger.addHandler(log_handler)
 
     def save_aggregate_report_to_syslog(self, aggregate_reports):

diff --git a/pyproject.toml b/pyproject.toml
@@ -44,7 +44,7 @@ dependencies = [
     "google-auth-oauthlib>=0.4.6",
     "google-auth>=2.3.3",
     "imapclient>=2.1.0",
-    "kafka-python>=1.4.4",
+    "kafka-python-ng>=2.2.2",
     "lxml>=4.4.0",
     "mailsuite>=1.6.1",
     "msgraph-core==0.2.2",

diff --git a/requirements.txt b/requirements.txt
@@ -12,7 +12,7 @@ dateparser>=1.1.1
 elasticsearch<7.14.0
 elasticsearch-dsl>=7.4.0
 opensearch-py>=2.4.2,<=3.0.0
-kafka-python>=1.4.4
+kafka-python-ng>=2.2.2
 mailsuite>=1.6.1
 nose>=1.3.7
 wheel>=0.37.0
@@ -42,3 +42,4 @@ myst-parser[linkify]
 requests
 bs4
 pytest
+syslog2