github-public-mirror/ldap-acl-milter
1
0
Fork 0
mirror of https://github.com/chillout2k/ldap-acl-milter.git synced 2025-12-15 20:09:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27 from chillout2k/devel

Browse Source 
https://github.com/chillout2k/ldap-acl-milter/issues/26
This commit is contained in:
Dominik Chilla 2020-01-17 15:41:03 +01:00 committed by GitHub
commit 1ddec704f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/ldap-acl-milter.py
View File

@ -33,6 +33,7 @@ g_milter_schema = False
g_milter_schema_wildcard_domain = False # works only if g_milter_schema == True g_milter_schema_wildcard_domain = False # works only if g_milter_schema == True
g_milter_expect_auth = False g_milter_expect_auth = False
g_milter_whitelisted_rcpts = {} g_milter_whitelisted_rcpts = {}
g_re_srs = re.compile(r"^SRS0=.+=.+=(\S+)=(\S+)\@.+$")
class LdapAclMilter(Milter.Base): class LdapAclMilter(Milter.Base):
# Each new connection is handled in an own thread # Each new connection is handled in an own thread
@ -103,6 +104,16 @@ class LdapAclMilter(Milter.Base):
# BATV (https://tools.ietf.org/html/draft-levine-smtp-batv-01) # BATV (https://tools.ietf.org/html/draft-levine-smtp-batv-01)
# Strip out Simple Private Signature (PRVS) # Strip out Simple Private Signature (PRVS)
mailfrom = re.sub(r"^prvs=.{10}=", '', mailfrom) mailfrom = re.sub(r"^prvs=.{10}=", '', mailfrom)
# SRS (https://www.libsrs2.org/srs/srs.pdf)
m_srs = g_re_srs.match(mailfrom)
if m_srs != None:
logging.info(self.mconn_id + "/FROM " +
"Found SRS-encoded envelope-sender: " + mailfrom
)
mailfrom = m_srs.group(2) + '@' + m_srs.group(1)
logging.info(self.mconn_id + "/FROM " +
"SRS envelope-sender replaced with: " + mailfrom
)
self.env_from = mailfrom self.env_from = mailfrom
m = g_re_domain.match(self.env_from) m = g_re_domain.match(self.env_from)
if m == None: if m == None: