Pārlūkot izejas kodu

[Dovecot] Fix invalid rcpt when no bcc is set, fixes #3576

andryyy 5 gadi atpakaļ
vecāks
revīzija
bdbb0c34be
1 mainītis faili ar 4 papildinājumiem un 1 dzēšanām
  1. 4 1
      data/Dockerfiles/dovecot/quarantine_notify.py

+ 4 - 1
data/Dockerfiles/dovecot/quarantine_notify.py

@@ -86,7 +86,10 @@ def notify_rcpt(rcpt, msg_count, quarantine_acl):
       msg['To'] = str(rcpt)
       msg['To'] = str(rcpt)
       bcc = r.get('Q_BCC') or ""
       bcc = r.get('Q_BCC') or ""
       text = msg.as_string()
       text = msg.as_string()
-      server.sendmail(msg['From'], [str(rcpt)] + [str(bcc)], text)
+      if bcc == '':
+        server.sendmail(msg['From'], str(rcpt), text)
+      else:
+        server.sendmail(msg['From'], [str(rcpt)] + [str(bcc)], text)
       server.quit()
       server.quit()
       for res in meta_query:
       for res in meta_query:
         query_mysql('UPDATE quarantine SET notified = 1 WHERE id = "%d"' % (res['id']), update = True)
         query_mysql('UPDATE quarantine SET notified = 1 WHERE id = "%d"' % (res['id']), update = True)