holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-11-22 07:53:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for standard STARTTLS on port 143 (RFC 2595).

Browse Source 
Signed-off-by: Evili del Rio <evili.del.rio@gmail.com>
This commit is contained in:
Evili del Rio 2020-12-04 11:49:20 +01:00
parent b9855ec83f
commit baa763c784
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
helpdesk/email.py
View File

@ -101,6 +101,10 @@ def process_email(quiet=False):
def pop3_sync(q, logger, server): def pop3_sync(q, logger, server):
server.getwelcome() server.getwelcome()
try:
server.stls()
except Exception:
logger.warning("POP3 StartTLS failed or unsupported. Connection will be unencrypted.")
server.user(q.email_box_user or settings.QUEUE_EMAIL_BOX_USER) server.user(q.email_box_user or settings.QUEUE_EMAIL_BOX_USER)
server.pass_(q.email_box_pass or settings.QUEUE_EMAIL_BOX_PASSWORD) server.pass_(q.email_box_pass or settings.QUEUE_EMAIL_BOX_PASSWORD)
@ -138,6 +142,10 @@ def pop3_sync(q, logger, server):
def imap_sync(q, logger, server): def imap_sync(q, logger, server):
try: try:
try:
server.starttl()
except Exception:
logger.warning("IMAP4 StartTLS unsupported or failed. Connection will be unencrypted.")
server.login(q.email_box_user or server.login(q.email_box_user or
settings.QUEUE_EMAIL_BOX_USER, settings.QUEUE_EMAIL_BOX_USER,
q.email_box_pass or q.email_box_pass or