7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Web, Quarantine] Allow to set the max score of a message up to which a quarantine notification will be sent

Browse Source
This commit is contained in:
andryyy
2020-10-27 21:34:02 +01:00
parent 1cb4d59e84
commit 6c697f3f3f
5 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,10 @@ while True:
time_now = int(time.time())
max_score = float(r.get('Q_MAX_SCORE') or "9999.0")
if max_score == "":
max_score = 9999.0
def query_mysql(query, headers = True, update = False):
while True:
try:
@@ -55,7 +59,7 @@ def query_mysql(query, headers = True, update = False):
cnx.close()
def notify_rcpt(rcpt, msg_count, quarantine_acl):
meta_query = query_mysql('SELECT SHA2(CONCAT(id, qid), 256) AS qhash, id, subject, score, sender, created FROM quarantine WHERE notified = 0 AND rcpt = "%s"' % (rcpt))
meta_query = query_mysql('SELECT SHA2(CONCAT(id, qid), 256) AS qhash, id, subject, score, sender, created FROM quarantine WHERE notified = 0 AND rcpt = "%s" AND score < %f' % (rcpt, max_score))
if r.get('Q_HTML'):
try:
template = Template(r.get('Q_HTML'))
@@ -100,7 +104,7 @@ def notify_rcpt(rcpt, msg_count, quarantine_acl):
server.sendmail(msg['From'], [str(redirect)] + [str(bcc)], text)
server.quit()
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)
r.hset('Q_LAST_NOTIFIED', record['rcpt'], time_now)
break
except Exception as ex:
@@ -108,7 +112,7 @@ 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 FROM quarantine LEFT OUTER JOIN user_acl ON user_acl.username = rcpt WHERE notified = 0 AND score < %f AND rcpt in (SELECT username FROM mailbox) GROUP BY rcpt' % (max_score))
for record in records:
attrs = ''
@@ -134,13 +138,13 @@ for record in records:
continue
if attrs['quarantine_notification'] == 'hourly':
if last_notification == 0 or (last_notification + 3600) < time_now:
print("Notifying %s about %d new items in quarantine" % (record['rcpt'], record['counter']))
print("Notifying %s: Considering %d new items in quarantine" % (record['rcpt'], record['counter']))
notify_rcpt(record['rcpt'], record['counter'], record['quarantine_acl'])
elif attrs['quarantine_notification'] == 'daily':
if last_notification == 0 or (last_notification + 86400) < time_now:
print("Notifying %s about %d new items in quarantine" % (record['rcpt'], record['counter']))
print("Notifying %s: Considering %d new items in quarantine" % (record['rcpt'], record['counter']))
notify_rcpt(record['rcpt'], record['counter'], record['quarantine_acl'])
elif attrs['quarantine_notification'] == 'weekly':
if last_notification == 0 or (last_notification + 604800) < time_now:
print("Notifying %s about %d new items in quarantine" % (record['rcpt'], record['counter']))
print("Notifying %s: Considering %d new items in quarantine" % (record['rcpt'], record['counter']))
notify_rcpt(record['rcpt'], record['counter'], record['quarantine_acl'])