From 320de5bd893608e79d889e2f637ba83d343d5604 Mon Sep 17 00:00:00 2001 From: Israel Figueroa Date: Fri, 21 Jan 2022 19:37:07 -0300 Subject: [PATCH] TLS patch --- mayordomo/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mayordomo/__init__.py b/mayordomo/__init__.py index 2f7b86c..0353a7a 100644 --- a/mayordomo/__init__.py +++ b/mayordomo/__init__.py @@ -18,6 +18,10 @@ from .resolver import updateDNS smtprelayport = '10025' bindip = '0.0.0.0' +cacerts = '/etc/ssl/certs/ca-certificates.crt' +keyfile = '/var/run/secrets/keyfile' +certfile = '/var/run/secrets/certfile' + if not os.environ.get('SMTP_HOSTNAME'): banner_hostname = 'midominio.cl' else: @@ -43,7 +47,7 @@ async def enviarCorreosDominio(dominioid): try: conectado = False try: - smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), port=465, use_tls=True, validate_certs=False, timeout=10) + smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), source_address=banner_hostname, port=465, use_tls=True, validate_certs=True, client_cert=certfile, client_key=keyfile, cert_bundle=cacerts, timeout=10) await smtp.connect() conectado = True except Exception as e: @@ -52,7 +56,7 @@ async def enviarCorreosDominio(dominioid): if conectado == False: try: - smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), port=587, use_tls=False, validate_certs=False, timeout=10) + smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), source_address=banner_hostname, port=587, use_tls=True, validate_certs=True, client_cert=certfile, client_key=keyfile, cert_bundle=cacerts, timeout=10) await smtp.connect() await smtp.starttls() conectado = True