github-public-mirror/ExOTA-Milter
1
0
Fork 0
mirror of https://github.com/chillout2k/ExOTA-Milter.git synced 2025-12-15 18:59:45 +00:00
Code Issues Releases Wiki Activity

cosmetic changes

Browse Source
This commit is contained in:
Dominik Chilla 2020-11-29 03:11:01 +01:00
parent f69080e6cb
commit 61da6219c0
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/exota-milter.py
View File

@ -34,7 +34,6 @@ class ExOTAMilter(Milter.Base):
self.hdr_from = None self.hdr_from = None
self.hdr_from_domain = None self.hdr_from_domain = None
self.hdr_tenant_id = None self.hdr_tenant_id = None
self.tenant_id_valid = False
self.dkim_results = [] self.dkim_results = []
self.dkim_valid = False self.dkim_valid = False
# https://stackoverflow.com/a/2257449 # https://stackoverflow.com/a/2257449
@ -167,7 +166,7 @@ class ExOTAMilter(Milter.Base):
return Milter.REJECT return Milter.REJECT
if g_milter_dkim_enabled == True and g_milter_policy[self.hdr_from_domain]['dkim'] == True: 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) "/EOM: 5322.from_domain={0} dkim_auth=enabled".format(self.hdr_from_domain)
) )
if len(self.dkim_results) > 0: if len(self.dkim_results) > 0:
@ -180,7 +179,7 @@ class ExOTAMilter(Milter.Base):
) )
if dkim_result['result'] == 'pass': if dkim_result['result'] == 'pass':
logging.info(self.mconn_id + "/" + self.queue_id + 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'] self.hdr_from_domain, dkim_result['selector']
) )
) )
@ -188,7 +187,7 @@ class ExOTAMilter(Milter.Base):
continue continue
else: else:
logging.info(self.mconn_id + "/" + self.queue_id + 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'] 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) self.setreply('550','5.7.1', g_milter_reject_message)
return Milter.REJECT 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 return Milter.CONTINUE
def abort(self): def abort(self):

2
tests/README.md
View File

@ -14,4 +14,4 @@ export MILTER_DKIM_AUTHSERVID=my-auth-serv-id
First of all install the `miltertest` binary. Under debian based distros First of all install the `miltertest` binary. Under debian based distros
it´s located in the `opendkim-tools` package. it´s located in the `opendkim-tools` package.
`miltertest -v -D socket=/tmp/exota-milter -s tests/miltertest.lua` `miltertest -v -D socket="${MILTER_SOCKET}" -s tests/miltertest.lua`