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

[Dovecot] Fixed quarantine_notify.py json decode error

master
zekeriya 2019-09-14 21:01:53 +03:00
parent b9e7d12a5e
commit 8af9b5b6d1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,4 @@
#!/usr/bin/python3
import smtplib import smtplib
import os import os
@ -82,7 +83,7 @@ def notify_rcpt(rcpt, msg_count, quarantine_acl):
msg.attach(html_part) msg.attach(html_part)
msg['To'] = str(rcpt) msg['To'] = str(rcpt)
text = msg.as_string() text = msg.as_string()
server.sendmail(msg['From'].encode("ascii", errors="ignore"), msg['To'], text) server.sendmail(msg['From'], msg['To'], 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)
@ -107,7 +108,8 @@ for record in records:
print('Could not determine last notification for %s, assuming never' % (record['rcpt'])) print('Could not determine last notification for %s, assuming never' % (record['rcpt']))
last_notification = 0 last_notification = 0
attrs_json = query_mysql('SELECT attributes FROM mailbox WHERE username = "%s"' % (record['rcpt'])) attrs_json = query_mysql('SELECT attributes FROM mailbox WHERE username = "%s"' % (record['rcpt']))
attrs = json.loads(str(attrs_json[0]['attributes'])) print("\n\n\n\n",attrs_json,"\n\n\n\n")
attrs = json.loads(str(attrs_json[0]['attributes'].decode('utf-8')))
if attrs['quarantine_notification'] not in ('hourly', 'daily', 'weekly', 'never'): if attrs['quarantine_notification'] not in ('hourly', 'daily', 'weekly', 'never'):
print('Abnormal quarantine_notification value') print('Abnormal quarantine_notification value')
continue continue