ghostwheel42's suggestion

master
Florent Daigniere 3 years ago
parent d723326b8e
commit cd3eee4c51

@ -159,20 +159,13 @@ def postfix_sender_rate(sender):
def postfix_sender_access(sender): def postfix_sender_access(sender):
""" Simply reject any sender that pretends to be from a local domain """ Simply reject any sender that pretends to be from a local domain
""" """
try: if '@' in email:
if not is_void_address(sender): if email.startswith('<') and email.endswith('>'):
email = email[1:-1]
try:
localpart, domain_name = models.Email.resolve_domain(sender) localpart, domain_name = models.Email.resolve_domain(sender)
return flask.jsonify("REJECT") if models.Domain.query.get(domain_name) else flask.abort(404) if models.Domain.query.get(domain_name):
except sqlalchemy.exc.StatementError: return flask.jsonify("REJECT")
pass except sqlalchemy.exc.StatementError:
pass
return flask.abort(404) return flask.abort(404)
def is_void_address(email):
'''True if the email is void (null) email address.
'''
if email.startswith('<') and email.endswith('>'):
email = email[1:-1]
# Some MTAs use things like '<MAILER-DAEMON>' instead of '<>'; so let's
# consider void any such thing.
return '@' not in email

Loading…
Cancel
Save