ifiguero
/
pysmtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

deprecation warning

master
ifiguero 2023-07-28 18:19:33 -04:00
parent eae72ed827
commit 50727c5e32
1 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
mayordomo/__init__.py
View File

@ -36,7 +36,7 @@ else:
async def enviarCorreosDominio(dominioid): async def enviarCorreosDominio(dominioid):
valido = int(time.time()) valido = int(time.time())
if os.environ.get('DKIM_PRIVKEY'): if os.environ.get('DKIM_PRIVKEY'):
try: try:
await log.debug('Leyendo llave: {}.'.format(os.environ.get('DKIM_PRIVKEY'))) await log.debug('Leyendo llave: {}.'.format(os.environ.get('DKIM_PRIVKEY')))
@ -48,20 +48,20 @@ async def enviarCorreosDominio(dominioid):
await log.debug('Enviando correos dominio {}'.format(dominioid)) await log.debug('Enviando correos dominio {}'.format(dominioid))
indices = [] indices = []
servidores = await db.execute(select(ARecord).where(ARecord.fqdnid.in_(select(MXRecord.fqdnmxid).where(MXRecord.fqdnid==dominioid, MXRecord.validohasta>valido)))) servidores = await db.execute(select(ARecord).where(ARecord.fqdnid.in_(select(MXRecord.fqdnmxid).where(MXRecord.fqdnid==dominioid, MXRecord.validohasta>valido))))
for arecordx in servidores.scalars(): for arecordx in servidores.scalars():
indice = arecordx.enviados + arecordx.errores*20 indice = arecordx.enviados + arecordx.errores*20
indices.append((indice, arecordx)) indices.append((indice, arecordx))
# await log.debug('El dominio tiene un total de {} servidores'.format(len(indices))) # await log.debug('El dominio tiene un total de {} servidores'.format(len(indices)))
for _, arecord in sorted(indices, key=lambda tup: tup[0]): for _, arecord in sorted(indices, key=lambda tup: tup[0]):
ipresult = await db.execute(select(IPV4Addr).where(IPV4Addr.id==arecord.ipv4id)) ipresult = await db.execute(select(IPV4Addr).where(IPV4Addr.id==arecord.ipv4id))
dbdireccion = ipresult.scalar_one_or_none() dbdireccion = ipresult.scalar_one_or_none()
try: try:
conectado = False conectado = False
try: try:
smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), source_address=banner_hostname, port=25, start_tls=True, use_tls=False, validate_certs=False, timeout=10) smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), local_hostname=banner_hostname, port=25, start_tls=True, use_tls=False, validate_certs=False, timeout=10)
await smtp.connect() await smtp.connect()
conectado = True conectado = True
await log.debug('Conectado a START_TLS: 25 {}'.format(dbdireccion.ipaddr)) await log.debug('Conectado a START_TLS: 25 {}'.format(dbdireccion.ipaddr))
@ -71,7 +71,7 @@ async def enviarCorreosDominio(dominioid):
if conectado == False: if conectado == False:
try: try:
smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), source_address=banner_hostname, port=465, use_tls=True, validate_certs=False, timeout=10) smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), local_hostname=banner_hostname, port=465, use_tls=True, validate_certs=False, timeout=10)
await smtp.connect() await smtp.connect()
conectado = True conectado = True
await log.debug('Conectado a USE_TLS 456: {}'.format(dbdireccion.ipaddr)) await log.debug('Conectado a USE_TLS 456: {}'.format(dbdireccion.ipaddr))
@ -81,26 +81,26 @@ async def enviarCorreosDominio(dominioid):
if conectado == False: if conectado == False:
try: try:
smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), source_address=banner_hostname, port=587, start_tls=True, validate_certs=False, timeout=10) smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), local_hostname=banner_hostname, port=587, start_tls=True, validate_certs=False, timeout=10)
await smtp.connect() await smtp.connect()
conectado = True conectado = True
await log.debug('Conectado a START_TLS 587: {}'.format(dbdireccion.ipaddr)) await log.debug('Conectado a START_TLS 587: {}'.format(dbdireccion.ipaddr))
except Exception as e: except Exception as e:
conectado = False conectado = False
await log.debug('Error al conectar al servidor start_tls 587: {}'.format(e)) await log.debug('Error al conectar al servidor start_tls 587: {}'.format(e))
if conectado == False: if conectado == False:
try: try:
smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), timeout=10) smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), timeout=10)
await smtp.connect() await smtp.connect()
await smtp.helo(banner_hostname) await smtp.helo(banner_hostname)
conectado = True conectado = True
await log.debug('Conectado a capela: {}'.format(dbdireccion.ipaddr)) await log.debug('Conectado a capela: {}'.format(dbdireccion.ipaddr))
except Exception as e: except Exception as e:
conectado = False conectado = False
await log.debug('Error al conectar al servidor {}: {}'.format(dbdireccion.ipaddr, e)) await log.debug('Error al conectar al servidor {}: {}'.format(dbdireccion.ipaddr, e))
continue continue
limit = 30 limit = 30
await log.debug('Conectado a SMTP({}) '.format(dbdireccion.ipaddr)) await log.debug('Conectado a SMTP({}) '.format(dbdireccion.ipaddr))
rcartas = await db.execute(select(Carta).join(Destinatario).join(Direccion).where(Direccion.dominioid==dominioid, Destinatario.enviado==0)) rcartas = await db.execute(select(Carta).join(Destinatario).join(Direccion).where(Direccion.dominioid==dominioid, Destinatario.enviado==0))
@ -109,11 +109,11 @@ async def enviarCorreosDominio(dominioid):
if limit < 3: if limit < 3:
await log.info('Se mandaron {} correos a un servidor. Pedimos uno nuevo para seguir.'.format(30-limit)) await log.info('Se mandaron {} correos a un servidor. Pedimos uno nuevo para seguir.'.format(30-limit))
return False return False
rteresult = await db.execute(select(Direccion).where(Direccion.id==carta.remitenteid)) rteresult = await db.execute(select(Direccion).where(Direccion.id==carta.remitenteid))
remitente = rteresult.scalar_one_or_none() remitente = rteresult.scalar_one_or_none()
rcpt_to = [] rcpt_to = []
rdest = await db.execute(select(Destinatario).join(Direccion).where(Direccion.dominioid==dominioid, Destinatario.cartaid==carta.id, Destinatario.enviado==0)) rdest = await db.execute(select(Destinatario).join(Direccion).where(Direccion.dominioid==dominioid, Destinatario.cartaid==carta.id, Destinatario.enviado==0))
for destinatario in rdest.scalars(): for destinatario in rdest.scalars():
destresult = await db.execute(select(Direccion).where(Direccion.id==destinatario.direccionid)) destresult = await db.execute(select(Direccion).where(Direccion.id==destinatario.direccionid))
@ -122,56 +122,56 @@ async def enviarCorreosDominio(dominioid):
limit -= 1 limit -= 1
if limit <= 0: if limit <= 0:
break break
if len(rcpt_to) == 0: if len(rcpt_to) == 0:
continue continue
await db.commit() await db.commit()
rdest = await db.execute(select(Destinatario).join(Direccion).where(Direccion.dominioid==dominioid, Destinatario.cartaid==carta.id, Destinatario.enviado==0)) rdest = await db.execute(select(Destinatario).join(Direccion).where(Direccion.dominioid==dominioid, Destinatario.cartaid==carta.id, Destinatario.enviado==0))
await log.info("Carta Rte '{}' => Destinatarios '{}' ".format(remitente.direccion, ', '.join(rcpt_to))) await log.info("Carta Rte '{}' => Destinatarios '{}' ".format(remitente.direccion, ', '.join(rcpt_to)))
try: try:
if dkimKey is not None: if dkimKey is not None:
mail2send = BytesParser(policy=default).parsebytes(carta.contenido.encode('utf-8')) mail2send = BytesParser(policy=default).parsebytes(carta.contenido.encode('utf-8'))
signature = dkim.sign(mail2send.as_bytes(), b'mayordomo', b'ilab.cl', dkimKey, include_headers=[b'from', b'to', b'subject', b'message-id']).decode().replace("\r\n",'') signature = dkim.sign(mail2send.as_bytes(), b'mayordomo', b'ilab.cl', dkimKey, include_headers=[b'from', b'to', b'subject', b'message-id']).decode().replace("\r\n",'')
mail2send['DKIM-Signature'] = signature[len("DKIM-Signature: "):] mail2send['DKIM-Signature'] = signature[len("DKIM-Signature: "):]
await log.debug("Signature: {}".format(mail2send['DKIM-Signature'])) await log.debug("Signature: {}".format(mail2send['DKIM-Signature']))
await smtp.sendmail(remitente.direccion, rcpt_to, mail2send.as_bytes()) await smtp.sendmail(remitente.direccion, rcpt_to, mail2send.as_bytes())
else: else:
await smtp.sendmail(remitente.direccion, rcpt_to, carta.contenido.encode('utf-8')) await smtp.sendmail(remitente.direccion, rcpt_to, carta.contenido.encode('utf-8'))
for destinatario in rdest.scalars(): for destinatario in rdest.scalars():
destinatario.enviado = 1 destinatario.enviado = 1
arecord.enviados = arecord.enviados + 1 arecord.enviados = arecord.enviados + 1
except Exception as e: except Exception as e:
await log.warning('Error al enviar el correo {}'.format(e)) await log.warning('Error al enviar el correo {}'.format(e))
await log.warning('Traceback {}'.format(traceback.format_exc())) await log.warning('Traceback {}'.format(traceback.format_exc()))
for destinatario in rdest.scalars(): for destinatario in rdest.scalars():
if destinatario.intentos > 2: if destinatario.intentos > 2:
destinatario.enviado = 2 destinatario.enviado = 2
arecord.errores = arecord.errores + 1 arecord.errores = arecord.errores + 1
await db.commit() await db.commit()
await smtp.quit() await smtp.quit()
return True return True
except Exception as e: except Exception as e:
await log.warning('Error en el servidor {}'.format(e)) await log.warning('Error en el servidor {}'.format(e))
arecord.errores = arecord.errores + 1 arecord.errores = arecord.errores + 1
await db.commit() await db.commit()
except: except:
await log.warning('Traceback {}'.format(traceback.format_exc())) await log.warning('Traceback {}'.format(traceback.format_exc()))
return False return False
async def enviaCorreos(): async def enviaCorreos():
try: try:
@ -181,7 +181,7 @@ async def enviaCorreos():
result = await db.execute(select(Direccion).where(Direccion.id==destinatario.direccionid)) result = await db.execute(select(Direccion).where(Direccion.id==destinatario.direccionid))
dbemail = result.scalar_one_or_none() dbemail = result.scalar_one_or_none()
await enviarCorreosDominio(dbemail.dominioid) await enviarCorreosDominio(dbemail.dominioid)
except: except:
await log.error('Traceback {}'.format(traceback.format_exc())) await log.error('Traceback {}'.format(traceback.format_exc()))
@ -205,29 +205,29 @@ async def cleanupSent():
await db.execute(delete(Carta).where(Carta.id==cartaid)) await db.execute(delete(Carta).where(Carta.id==cartaid))
await db.commit() await db.commit()
returnvalue = False returnvalue = False
except: except:
await log.error('Traceback {}'.format(traceback.format_exc())) await log.error('Traceback {}'.format(traceback.format_exc()))
return returnvalue return returnvalue
def create_async_smtp_server(): def create_async_smtp_server():
return Controller(ilabHandler(), hostname=bindip, port=smtprelayport) return Controller(ilabHandler(), hostname=bindip, port=smtprelayport)
async def pre_process(): async def pre_process():
try: try:
if await updateDNS(): if await updateDNS():
return True return True
except: except:
pass pass
return False return False
if __name__ == '__main__': if __name__ == '__main__':
mayordomo = create_async_smtp_server() mayordomo = create_async_smtp_server()
mayordomo.start() mayordomo.start()
input(u'SMTP server (Mayordomo) esta operativo') input(u'SMTP server (Mayordomo) esta operativo')
mayordomo.stop() mayordomo.stop()