From ea4ec932dfed0c9679f26e3448627df3965fc31a Mon Sep 17 00:00:00 2001 From: Mathias Rav Date: Fri, 9 Dec 2016 16:23:11 +0100 Subject: [PATCH] Don't forward delivery failures to webfar --- tutormail/server.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tutormail/server.py b/tutormail/server.py index ac875cb..6b16a4c 100644 --- a/tutormail/server.py +++ b/tutormail/server.py @@ -68,7 +68,19 @@ def __init__(self, *args, **kwargs): self.exceptions = set() + def reject(self, envelope): + rcpttos = tuple(r.lower() for r in envelope.rcpttos) + subject = str(envelope.message.subject) + return (rcpttos == ('webfar@matfystutor.dk',) + and ('Delayed Mail' in subject + or 'Undelivered Mail Returned to Sender' in subject)) + def handle_envelope(self, envelope, peer): + if self.reject(envelope): + description = summary = 'Rejected due to reject()' + self.store_failed_envelope(envelope, description, summary) + return + try: result = super(TutorForwarder, self).handle_envelope(envelope, peer) django.db.connection.close()