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

Merge pull request #44 from chillout2k/devel

Browse Source 
LDAP thread safe
This commit is contained in:
Dominik Chilla 2022-08-24 17:36:00 +02:00 committed by GitHub
commit f589488299
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/exota-milter.py
View File

@ -308,7 +308,7 @@ class ExOTAMilter(Milter.Base):
) )
return self.smfir_reject( return self.smfir_reject(
queue_id = self.getsymval('i'), queue_id = self.getsymval('i'),
reason = 'Multiple/different tenant-IDs headers found!' reason = 'Multiple/different tenant-ID headers found!'
) )
# Get policy for 5322.from_domain # Get policy for 5322.from_domain

24
app/policy.py
View File

@ -4,7 +4,8 @@ import re
from uuid import UUID from uuid import UUID
from ldap3.core.exceptions import LDAPException from ldap3.core.exceptions import LDAPException
from ldap3 import ( from ldap3 import (
Server, Connection, NONE, set_config_parameter Server, Connection, NONE, set_config_parameter,
SAFE_RESTARTABLE
) )
from logger import log_debug from logger import log_debug
@ -166,7 +167,7 @@ class ExOTAPolicyBackendLDAP(ExOTAPolicyBackend):
self.ldap_bindpw, self.ldap_bindpw,
auto_bind = True, auto_bind = True,
raise_exceptions = True, raise_exceptions = True,
client_strategy = 'RESTARTABLE', client_strategy = 'SAFE_RESTARTABLE',
receive_timeout = self.ldap_receive_timeout receive_timeout = self.ldap_receive_timeout
) )
except LDAPException as e: except LDAPException as e:
@ -185,34 +186,35 @@ class ExOTAPolicyBackendLDAP(ExOTAPolicyBackend):
log_debug("LDAP-QUERY-Template: {0}".format(self.query_template)) log_debug("LDAP-QUERY-Template: {0}".format(self.query_template))
log_debug("LDAP-QUERY: {0}".format(ldap_query)) log_debug("LDAP-QUERY: {0}".format(ldap_query))
try: try:
self.conn.search( _, _, response, _ = self.conn.search(
self.search_base, self.search_base,
ldap_query, ldap_query,
attributes=[ attributes = [
self.tenant_id_attr, self.tenant_id_attr,
self.dkim_enabled_attr, self.dkim_enabled_attr,
self.dkim_alignment_required_attr self.dkim_alignment_required_attr
] ]
) )
log_debug("LDAP ENTRIES: {0}".format(self.conn.entries)) log_debug("LDAP ENTRY: {0}".format(response))
if len(self.conn.entries) == 1: if len(response) == 1:
entry = self.conn.entries[0] entry = response[0]['attributes']
policy_dict = {} policy_dict = {}
if self.tenant_id_attr in entry: if self.tenant_id_attr in entry:
policy_dict['tenant_id'] = entry[self.tenant_id_attr].value policy_dict['tenant_id'] = entry[self.tenant_id_attr][0]
if self.dkim_enabled_attr in entry: if self.dkim_enabled_attr in entry:
if entry[self.dkim_enabled_attr].value == 'TRUE': if entry[self.dkim_enabled_attr][0] == 'TRUE':
policy_dict['dkim_enabled'] = True policy_dict['dkim_enabled'] = True
else: else:
policy_dict['dkim_enabled'] = False policy_dict['dkim_enabled'] = False
if self.dkim_alignment_required_attr in entry: if self.dkim_alignment_required_attr in entry:
if entry[self.dkim_alignment_required_attr].value == 'TRUE': if entry[self.dkim_alignment_required_attr][0] == 'TRUE':
policy_dict['dkim_alignment_required'] = True policy_dict['dkim_alignment_required'] = True
else: else:
policy_dict['dkim_alignment_required'] = False policy_dict['dkim_alignment_required'] = False
log_debug("POLICY_DICT: {}".format(policy_dict))
ExOTAPolicy.check_policy(policy_dict) ExOTAPolicy.check_policy(policy_dict)
return ExOTAPolicy(policy_dict) return ExOTAPolicy(policy_dict)
elif len(self.conn.entries) > 1: elif len(response) > 1:
raise ExOTAPolicyInvalidException( raise ExOTAPolicyInvalidException(
"Multiple policies found for domain={0}!".format(from_domain) "Multiple policies found for domain={0}!".format(from_domain)
) )