Mercurial > p > roundup > code
comparison roundup/mailer.py @ 7968:d7e79f8eb943
issue2551350 - Python changes for 3.12 with roundup 2.3.0 mailer.py
Fix due to change in smtplib.SMTP.starttls() signature.
As of 3.3 it can use an optional ssl context argument for
certificates/keys. In 3.12 it dropped legacy support for specifing
cert/key files as arguments and requires a context.
I modified Andrew's original patch to initialize SSLContext with
ssl.PROTOCOL_TLS_CLIENT.
If there is a cert file specified, enable
check_hostname - verify that the cert supplied by the server matches
the hostname we supplied.
If there is no cert file call
load_default_certs()
Also opened issue2551351 to look into more SMTP ssmtp tightening. We
also should have an option in Roundup to use TLS/SSL (smtps) without
using starttls.
Note that this code is untested by the test suite due to the need to
setup an SMTP server with STARTTLS support. issue2551351 has some
notes on this.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Wed, 15 May 2024 00:08:05 -0400 |
| parents | 3cd43c34c095 |
| children |
comparison
equal
deleted
inserted
replaced
| 7967:70703d22c79a | 7968:d7e79f8eb943 |
|---|---|
| 4 | 4 |
| 5 import logging | 5 import logging |
| 6 import os | 6 import os |
| 7 import smtplib | 7 import smtplib |
| 8 import socket | 8 import socket |
| 9 import ssl | |
| 9 import sys | 10 import sys |
| 10 import time | 11 import time |
| 11 import traceback | 12 import traceback |
| 12 | 13 |
| 13 from email import charset | 14 from email import charset |
| 310 local_hostname=config['MAIL_LOCAL_HOSTNAME']) | 311 local_hostname=config['MAIL_LOCAL_HOSTNAME']) |
| 311 | 312 |
| 312 # start the TLS if requested | 313 # start the TLS if requested |
| 313 if config["MAIL_TLS"]: | 314 if config["MAIL_TLS"]: |
| 314 self.ehlo() | 315 self.ehlo() |
| 315 self.starttls(config["MAIL_TLS_KEYFILE"], | 316 if sys.version_info[0:2] >= (3, 6): |
| 316 config["MAIL_TLS_CERTFILE"]) | 317 sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT) |
| 318 if config["MAIL_TLS_CERTFILE"]: | |
| 319 sslctx.load_cert_chain(config["MAIL_TLS_CERTFILE"], | |
| 320 keyfile=config["MAIL_TLS_KEYFILE"]) | |
| 321 sslctx.check_hostname = True | |
| 322 else: | |
| 323 sslctx.load_default_certs() | |
| 324 self.starttls(context=sslctx) | |
| 325 else: | |
| 326 self.starttls(config["MAIL_TLS_KEYFILE"], | |
| 327 config["MAIL_TLS_CERTFILE"]) | |
| 317 | 328 |
| 318 # ok, now do we also need to log in? | 329 # ok, now do we also need to log in? |
| 319 mailuser = config["MAIL_USERNAME"] | 330 mailuser = config["MAIL_USERNAME"] |
| 320 if mailuser: | 331 if mailuser: |
| 321 self.login(mailuser, config["MAIL_PASSWORD"]) | 332 self.login(mailuser, config["MAIL_PASSWORD"]) |