hrfee/jellyfin-accounts
1
0
Fork 0
mirror of https://github.com/hrfee/jellyfin-accounts.git synced 2025-12-08 11:39:33 +00:00
Code Issues Projects Releases Wiki Activity

Added STARTTLS for SMTP

Browse Source 
As many services don't support full encryption, there is now an
encryption option in the [smtp] section, allowing you to choose between
ssl_tls and starttls.
This commit is contained in:
Harvey Tindall
2020-04-26 21:28:55 +01:00
parent 3499843878
commit 16a7ceb8ea
3 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
jellyfin_accounts/email.py
View File

@@ -139,7 +139,6 @@ class Smtp(Email):
except ValueError:
self.port = 465
log.debug(f'{self.address}: Defaulting to port {self.port}')
self.context = ssl.create_default_context()
def send(self):
message = MIMEMultipart("alternative")
@@ -151,15 +150,29 @@ class Smtp(Email):
message.attach(text)
message.attach(html)
try:
with smtplib.SMTP_SSL(self.server,
self.port,
context=self.context) as server:
server.login(self.from_address, self.password)
server.sendmail(self.from_address,
self.address,
message.as_string())
log.info(f'{self.address}: Sent via smtp')
return True
if config['smtp']['encryption'] == 'ssl_tls':
self.context = ssl.create_default_context()
with smtplib.SMTP_SSL(self.server,
self.port,
context=self.context) as server:
server.ehlo()
server.login(self.from_address, self.password)
server.sendmail(self.from_address,
self.address,
message.as_string())
log.info(f'{self.address}: Sent via smtp (ssl/tls)')
return True
elif config['smtp']['encryption'] == 'starttls':
with smtplib.SMTP(self.server,
self.port) as server:
server.ehlo()
server.starttls()
server.login(self.from_address, self.password)
server.sendmail(self.from_address,
self.address,
message.as_string())
log.info(f'{self.address}: Sent via smtp (starttls)')
return True
except Exception as e:
err = f'{self.address}: Failed to send via smtp: '
err += type(e).__name__