p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #34118 -- Used smtplib's context parameter instead of keyfile and certfile. 

keyfile and certfile parameters were removed in Python 3.12, see
ef0e72b31d
This commit is contained in:
Mariusz Felisiak 2022-11-16 11:30:59 +01:00 committed by GitHub
parent 67504ea505
commit 2848e5d0ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
django/core/mail/backends/smtp.py
View File

@ -7,6 +7,7 @@ from django.conf import settings
from django.core.mail.backends.base import BaseEmailBackend from django.core.mail.backends.base import BaseEmailBackend
from django.core.mail.message import sanitize_address from django.core.mail.message import sanitize_address
from django.core.mail.utils import DNS_NAME from django.core.mail.utils import DNS_NAME
from django.utils.functional import cached_property
class EmailBackend(BaseEmailBackend): class EmailBackend(BaseEmailBackend):
@ -54,6 +55,13 @@ class EmailBackend(BaseEmailBackend):
def connection_class(self): def connection_class(self):
return smtplib.SMTP_SSL if self.use_ssl else smtplib.SMTP return smtplib.SMTP_SSL if self.use_ssl else smtplib.SMTP
@cached_property
def ssl_context(self):
ssl_context = ssl.SSLContext(protocol=ssl.PROTOCOL_TLS_CLIENT)
if self.ssl_certfile or self.ssl_keyfile:
ssl_context.load_cert_chain(self.ssl_certfile, self.ssl_keyfile)
return ssl_context
def open(self): def open(self):
""" """
Ensure an open connection to the email server. Return whether or not a Ensure an open connection to the email server. Return whether or not a
@ -70,12 +78,7 @@ class EmailBackend(BaseEmailBackend):
if self.timeout is not None: if self.timeout is not None:
connection_params["timeout"] = self.timeout connection_params["timeout"] = self.timeout
if self.use_ssl: if self.use_ssl:
connection_params.update( connection_params["context"] = self.ssl_context
{
"keyfile": self.ssl_keyfile,
"certfile": self.ssl_certfile,
}
)
try: try:
self.connection = self.connection_class( self.connection = self.connection_class(
self.host, self.port, **connection_params self.host, self.port, **connection_params
@ -84,9 +87,7 @@ class EmailBackend(BaseEmailBackend):
# TLS/SSL are mutually exclusive, so only attempt TLS over # TLS/SSL are mutually exclusive, so only attempt TLS over
# non-secure connections. # non-secure connections.
if not self.use_ssl and self.use_tls: if not self.use_ssl and self.use_tls:
self.connection.starttls( self.connection.starttls(context=self.ssl_context)
keyfile=self.ssl_keyfile, certfile=self.ssl_certfile
)
if self.username and self.password: if self.username and self.password:
self.connection.login(self.username, self.password) self.connection.login(self.username, self.password)
return True return True