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

Quarantine notifications - exclude blacklisted sender (#3446) 

Final version, fixed syntax

Signed-off-by: Kristián Feldsam <feldsam@gmail.com>
master
Kristian Feldsam 2020-04-14 13:41:47 +02:00 committed by GitHub
parent 5944595be3
commit fe19bb7d94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,7 +97,13 @@ def notify_rcpt(rcpt, msg_count, quarantine_acl):
print('%s' % (ex))
time.sleep(3)
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')
records = query_mysql("""
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:
attrs = ''