Fix Davmail support

This commit is contained in:
Sean Whalen
2019-02-12 15:10:07 -05:00
parent 007225302e
commit a06db17a52
2 changed files with 9 additions and 5 deletions
+6 -3
View File
@@ -663,11 +663,14 @@ Run Davmail
Because you are interacting with Davmail server over the loopback
(i.e. 127.0.0.1), pass the following options to ``parsedmarc``:
(i.e. 127.0.0.1), add the following options to ``parsedmarc.ini`` config file:
.. code-block:: bash
.. code-block:: ini
--imap-no-ssl -H 127.0.0.1 --imap-port 1143
[imap]
host=127.0.0.1
port=1143
ssl=False
Elasticsearch and Kibana
------------------------
+3 -2
View File
@@ -986,9 +986,10 @@ def get_dmarc_reports_from_inbox(host=None,
try:
raw_msg = server.fetch(msg_uid,
["RFC822"])[msg_uid]
msg_keys = [b'RFC822', b'BODY[NULL]']
msg_keys = [b'RFC822', b'BODY[NULL]', b'BODY[]']
msg_key = ''
logging.debug("msg_keys: {0}".format(",".join(msg_keys)))
logging.debug("msg_keys: {0}".format(",".join(
raw_msg.keys())))
for key in msg_keys:
if key in raw_msg.keys():
msg_key = key