paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Dovecot] Revert notification excludes (there are no blacklisted elements in quarantine anymore)

master
andryyy 2020-10-23 20:24:18 +02:00
parent 9d0d826337
commit efc6f214d1
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/Dockerfiles/dovecot/quarantine_notify.py
View File

@ -108,13 +108,7 @@ def notify_rcpt(rcpt, msg_count, quarantine_acl):
print('%s' % (ex)) print('%s' % (ex))
time.sleep(3) time.sleep(3)
records = query_mysql(""" records = query_mysql('SELECT IFNULL(user_acl.quarantine, 0) AS quarantine_acl, count(id) AS counter, rcpt FROM quarantine LEFT OUTER JOIN user_acl ON user_acl.username = rcpt WHERE notified = 0 AND rcpt in (SELECT username FROM mailbox) GROUP BY rcpt')
SELECT IFNULL(user_acl.quarantine, 0) AS quarantine_acl, count(id) AS counter, rcpt, sender FROM quarantine
LEFT OUTER JOIN user_acl ON user_acl.username = rcpt
WHERE notified = 0 AND rcpt in (SELECT username FROM mailbox)
# dont send notifications for blacklisted senders
AND (SELECT prefid FROM filterconf WHERE option = "blacklist_from" AND (object = rcpt OR object = SUBSTRING(rcpt, LOCATE("@", rcpt) + 1)) AND sender REGEXP(REPLACE(value, '*', '.+'))) IS NULL GROUP BY rcpt
""")
for record in records: for record in records:
attrs = '' attrs = ''