nexus/ProxMenux
2
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-04-22 11:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update notification_channels.py

Browse Source
This commit is contained in:
MacRimi
2026-03-03 20:21:43 +01:00
parent efc2295b8d
commit 2851eae423
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
AppImage/scripts/notification_channels.py
View File

@@ -430,31 +430,50 @@ class EmailChannel(NotificationChannel):
if html_body: if html_body:
msg.add_alternative(html_body, subtype='html') msg.add_alternative(html_body, subtype='html')
server = None
try: try:
import ssl as _ssl
if self.tls_mode == 'ssl': if self.tls_mode == 'ssl':
server = smtplib.SMTP_SSL(self.host, self.port, timeout=self.timeout) ctx = _ssl.create_default_context()
server = smtplib.SMTP_SSL(self.host, self.port,
timeout=self.timeout, context=ctx)
server.ehlo() server.ehlo()
else: else:
server = smtplib.SMTP(self.host, self.port, timeout=self.timeout) server = smtplib.SMTP(self.host, self.port, timeout=self.timeout)
server.ehlo() server.ehlo()
if self.tls_mode == 'starttls': if self.tls_mode == 'starttls':
server.starttls() ctx = _ssl.create_default_context()
server.ehlo() # Re-identify after TLS upgrade server.starttls(context=ctx)
server.ehlo() # Re-identify after TLS -- server re-announces AUTH
if self.username and self.password: if self.username and self.password:
server.login(self.username, self.password) server.login(self.username, self.password)
server.send_message(msg) server.send_message(msg)
server.quit() server.quit()
server = None
return 200, 'OK' return 200, 'OK'
except smtplib.SMTPAuthenticationError as e: except smtplib.SMTPAuthenticationError as e:
return 0, f'SMTP authentication failed: {e}' return 0, f'SMTP authentication failed (check username/password or app-specific password): {e}'
except smtplib.SMTPNotSupportedError as e:
return 0, (f'SMTP AUTH not supported by server. '
f'This may mean the server requires OAuth2 or an App Password '
f'instead of regular credentials: {e}')
except smtplib.SMTPConnectError as e: except smtplib.SMTPConnectError as e:
return 0, f'SMTP connection failed: {e}' return 0, f'SMTP connection failed: {e}'
except smtplib.SMTPException as e: except smtplib.SMTPException as e:
return 0, f'SMTP error: {e}' return 0, f'SMTP error: {e}'
except _ssl.SSLError as e:
return 0, f'TLS/SSL error (check TLS mode and port): {e}'
except (OSError, TimeoutError) as e: except (OSError, TimeoutError) as e:
return 0, f'Connection error: {e}' return 0, f'Connection error: {e}'
finally:
if server:
try:
server.quit()
except Exception:
pass
def _send_sendmail(self, subject: str, body: str, severity: str, def _send_sendmail(self, subject: str, body: str, severity: str,
data: Optional[Dict] = None) -> Tuple[int, str]: data: Optional[Dict] = None) -> Tuple[int, str]: