upgrade to asiosmtpd

changedetectionio/tests/smtp/smtp-test-server.py

@@ -1,42 +1,51 @@
 #!/usr/bin/python3
-import smtpd
+import asyncio
-import asyncore
+from aiosmtpd.controller import Controller
+from aiosmtpd.smtp import SMTP
 
 # Accept a SMTP message and offer a way to retrieve the last message via TCP Socket
 
 last_received_message = b"Nothing"
 
 
-class CustomSMTPServer(smtpd.SMTPServer):
+class CustomSMTPHandler:
-
+    async def handle_DATA(self, server, session, envelope):
-    def process_message(self, peer, mailfrom, rcpttos, data, **kwargs):
         global last_received_message
-        last_received_message = data
+        last_received_message = envelope.content
-        print('Receiving message from:', peer)
+        print('Receiving message from:', session.peer)
-        print('Message addressed from:', mailfrom)
+        print('Message addressed from:', envelope.mail_from)
-        print('Message addressed to  :', rcpttos)
+        print('Message addressed to  :', envelope.rcpt_tos)
-        print('Message length        :', len(data))
+        print('Message length        :', len(envelope.content))
-        print(data.decode('utf8'))
+        print(envelope.content.decode('utf8'))
-        return
+        return '250 Message accepted for delivery'
-
+
-
+
-# Just print out the last message received on plain TCP socket server
+class EchoServerProtocol(asyncio.Protocol):
-class EchoServer(asyncore.dispatcher):
+    def connection_made(self, transport):
-
-    def __init__(self, host, port):
-        asyncore.dispatcher.__init__(self)
-        self.create_socket()
-        self.set_reuse_addr()
-        self.bind((host, port))
-        self.listen(5)
-
-    def handle_accepted(self, sock, addr):
         global last_received_message
-        print('Incoming connection from %s' % repr(addr))
+        self.transport = transport
-        sock.send(last_received_message)
+        peername = transport.get_extra_info('peername')
+        print('Incoming connection from {}'.format(peername))
+        self.transport.write(last_received_message)
+
         last_received_message = b''
+        self.transport.close()
+
+
+async def main():
+    # Start the SMTP server
+    controller = Controller(CustomSMTPHandler(), hostname='0.0.0.0', port=11025)
+    controller.start()
+
+    # Start the TCP Echo server
+    loop = asyncio.get_running_loop()
+    server = await loop.create_server(
+        lambda: EchoServerProtocol(),
+        '0.0.0.0', 11080
+    )
+    async with server:
+        await server.serve_forever()
 
 
-server = CustomSMTPServer(('0.0.0.0', 11025), None)  # SMTP mail goes here
+if __name__ == "__main__":
-server2 = EchoServer('0.0.0.0', 11080)  # Echo back last message received
+    asyncio.run(main())
-asyncore.loop()

changedetectionio/tests/smtp/test_notification_smtp.py

@@ -32,6 +32,8 @@ def get_last_message_from_smtp_server():
     client_socket.connect((smtp_test_server, port))  # connect to the server
 
     data = client_socket.recv(50024).decode()  # receive response
+    logging.info("get_last_message_from_smtp_server..")
+    logging.info(data)
     client_socket.close()  # close the connection
     return data