From 61da6219c0b86b313f527849246f2e851479afd7 Mon Sep 17 00:00:00 2001
From: Dominik Chilla <dominik@zwackl.de>
Date: Sun, 29 Nov 2020 03:11:01 +0100
Subject: [PATCH] cosmetic changes

---
 app/exota-milter.py | 13 +++++++++----
 tests/README.md     |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/exota-milter.py b/app/exota-milter.py
index fcde6e3..9fe7a06 100644
--- a/app/exota-milter.py
+++ b/app/exota-milter.py
@@ -34,7 +34,6 @@ class ExOTAMilter(Milter.Base):
     self.hdr_from = None
     self.hdr_from_domain = None
     self.hdr_tenant_id = None
-    self.tenant_id_valid = False
     self.dkim_results = []
     self.dkim_valid = False
     # https://stackoverflow.com/a/2257449
@@ -167,7 +166,7 @@ class ExOTAMilter(Milter.Base):
       return Milter.REJECT
 
     if g_milter_dkim_enabled == True and g_milter_policy[self.hdr_from_domain]['dkim'] == True:
-      logging.info(self.mconn_id + "/" + self.queue_id +
+      logging.debug(self.mconn_id + "/" + self.queue_id +
         "/EOM: 5322.from_domain={0} dkim_auth=enabled".format(self.hdr_from_domain)
       )
       if len(self.dkim_results) > 0:
@@ -180,7 +179,7 @@ class ExOTAMilter(Milter.Base):
             )
             if dkim_result['result'] == 'pass':
               logging.info(self.mconn_id + "/" + self.queue_id +
-                "/EOM: 5322.from_domain={0} selector={1} result=pass".format(
+                "/EOM: 5322.from_domain={0} dkim_selector={1} result=pass".format(
                   self.hdr_from_domain, dkim_result['selector']
                 )
               )
@@ -188,7 +187,7 @@ class ExOTAMilter(Milter.Base):
               continue
             else:
               logging.info(self.mconn_id + "/" + self.queue_id +
-                "/EOM: 5322.from_domain={0} selector={1} result=fail".format(
+                "/EOM: 5322.from_domain={0} dkim_selector={1} result=fail".format(
                   self.hdr_from_domain, dkim_result['selector']
                 )
               )
@@ -204,6 +203,12 @@ class ExOTAMilter(Milter.Base):
         )
         self.setreply('550','5.7.1', g_milter_reject_message)
         return Milter.REJECT
+        
+    logging.info(self.mconn_id + "/" + self.queue_id +
+      "/EOM: Authentication successful (dkim_enabled={0})".format(
+        str(g_milter_policy[self.hdr_from_domain]['dkim'])
+      )
+    )
     return Milter.CONTINUE
 
   def abort(self):
diff --git a/tests/README.md b/tests/README.md
index 9e1120f..603581c 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -14,4 +14,4 @@ export MILTER_DKIM_AUTHSERVID=my-auth-serv-id
 First of all install the `miltertest` binary. Under debian based distros 
 it´s located in the `opendkim-tools` package.
 
-`miltertest -v -D socket=/tmp/exota-milter -s tests/miltertest.lua`
\ No newline at end of file
+`miltertest -v -D socket="${MILTER_SOCKET}" -s tests/miltertest.lua`
\ No newline at end of file