public
nobgit
read
NobMail
Based on mailcow: dockerized
Languages
Repository composition by tracked source files.
PHP
49%
JavaScript
35%
HTML
9%
CSS
4%
Shell
2%
Python
1%
Lua
0%
Perl
0%
Ruby
0%
SCSS
0%
Create file
Wiki Documentation
Clone
https://nobgit.com/orgs/nobgit/nobmail.git
ssh://[email protected]:2222/orgs/nobgit/nobmail.git
Commit
[Dovecot] Fixed quarantine_notify.py json decode error
8af9b5b6
data/Dockerfiles/dovecot/quarantine_notify.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)Diff
diff --git a/data/Dockerfiles/dovecot/quarantine_notify.py b/data/Dockerfiles/dovecot/quarantine_notify.py
index 87ef1e01..8866d905 100755
--- a/data/Dockerfiles/dovecot/quarantine_notify.py
+++ b/data/Dockerfiles/dovecot/quarantine_notify.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
import smtplib
import os
@@ -82,7 +83,7 @@ def notify_rcpt(rcpt, msg_count, quarantine_acl):
msg.attach(html_part)
msg['To'] = str(rcpt)
text = msg.as_string()
- server.sendmail(msg['From'].encode("ascii", errors="ignore"), msg['To'], text)
+ server.sendmail(msg['From'], msg['To'], text)
server.quit()
for res in meta_query:
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']))
last_notification = 0
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'):
print('Abnormal quarantine_notification value')
continue