Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set TLS connection type: smtps/starttls #104

Merged
merged 3 commits into from
Apr 16, 2024
Merged

Set TLS connection type: smtps/starttls #104

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7be5410
Fix TLS connection smtps vs starttls in add-relay-rule/10test-credent…
stephdl Apr 12, 2024
d418100
Fix TLS connection issue in add-relay-rule/10test-credentials
stephdl Apr 12, 2024
95d441c
Fix TLS connection issue in add-relay-rule/10test-credentials
stephdl Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions imageroot/actions/add-relay-rule/10test-credentials
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,13 @@ ctx.verify_mode = ssl.CERT_NONE

try :
if tls:
smtp = smtplib.SMTP(host, port=port, timeout=10)
smtp.starttls(context=ctx)
# first we try to connect with starttls if it fails we try with smtps
try:
smtp = smtplib.SMTP(host, port=port, timeout=10)
smtp.starttls(context=ctx)
# if the server does not support starttls we try with smtps
except smtplib.SMTPNotSupportedError:
stephdl marked this conversation as resolved.
Show resolved Hide resolved
smtp = smtplib.SMTP_SSL(host, port=port, timeout=10, context=ctx)
else:
smtp = smtplib.SMTP(host, port=port, timeout=10)

Expand Down
Loading