add /ws/2/notify/ socket

core/lmtp/protocol.py

@@ -1,50 +0,0 @@
-import asyncio
-import logging
-
-from helper import create_task
-
-
-def make_reply(message, to, subject):
-    from email.message import EmailMessage
-    from core.settings import MAIL_DOMAIN
-
-    reply = EmailMessage()
-    reply["From"] = "noreply@" + MAIL_DOMAIN
-    reply["To"] = to
-    reply["Subject"] = subject
-    reply.set_content(message)
-
-    return reply
-
-
-async def send_smtp(message):
-    await asyncio.sleep(30)
-    import aiosmtplib
-    log = logging.getLogger('mail.log')
-    log.info('Sending message to %s' % message['To'])
-
-    await aiosmtplib.send(message, hostname="127.0.0.1", port=25, use_tls=False, start_tls=False)
-
-
-class LMTPHandler:
-    async def handle_RCPT(self, server, session, envelope, address, rcpt_options):
-        from core.settings import MAIL_DOMAIN
-        if not address.endswith('@' + MAIL_DOMAIN):
-            return '550 not relaying to that domain'
-        envelope.rcpt_tos.append(address)
-        return '250 OK'
-
-    async def handle_DATA(self, server, session, envelope):
-        log = logging.getLogger('mail.log')
-        log.info('Message from %s' % envelope.mail_from)
-        log.info('Message for %s' % envelope.rcpt_tos)
-        log.info('Message data:\n')
-        for ln in envelope.content.decode('utf8', errors='replace').splitlines():
-            log.info(f'> {ln}'.strip())
-        log.info('End of message')
-
-        create_task(send_smtp(make_reply("Thank you for your message.", envelope.mail_from, 'Message received')))
-
-        # asyncio.create_task(send_reply())
-
-        return '250 Message accepted for delivery'

core/mail/protocol.py

@@ -0,0 +1,69 @@
+import logging
+import aiosmtplib
+
+
+def make_reply(message, to, subject):
+    from email.message import EmailMessage
+    from core.settings import MAIL_DOMAIN
+
+    reply = EmailMessage()
+    reply["From"] = "noreply@" + MAIL_DOMAIN
+    reply["To"] = to
+    reply["Subject"] = subject
+    reply.set_content(message)
+
+    return reply
+
+
+async def send_smtp(message, log):
+    log.info('Sending message to %s' % message['To'])
+    await aiosmtplib.send(message, hostname="127.0.0.1", port=25, use_tls=False, start_tls=False)
+
+
+class LMTPHandler:
+    async def handle_RCPT(self, server, session, envelope, address, rcpt_options):
+        from core.settings import MAIL_DOMAIN
+        if not address.endswith('@' + MAIL_DOMAIN):
+            return '550 not relaying to that domain'
+        envelope.rcpt_tos.append(address)
+        return '250 OK'
+
+    async def handle_DATA(self, server, session, envelope):
+        import email
+        log = logging.getLogger('mail.log')
+        log.info('Message from %s' % envelope.mail_from)
+        log.info('Message for %s' % envelope.rcpt_tos)
+        log.info('Message data:\n')
+
+        try:
+            parsed = email.message_from_bytes(envelope.content)
+            body = ""
+            if parsed.is_multipart():
+                for part in parsed.walk():
+                    ctype = part.get_content_type()
+                    cdispo = str(part.get('Content-Disposition'))
+
+                    # skip any text/plain (txt) attachments
+                    if ctype == 'text/plain' and 'attachment' not in cdispo:
+                        body = part.get_payload(decode=True)
+                    else:
+                        log.info("Attachment", ctype, cdispo)
+            else:
+                body = parsed.get_payload(decode=True)
+            log.info(body)
+
+            header_from = parsed.get('From')
+            header_to = parsed.get('To')
+
+            if header_from != envelope.mail_from:
+                log.warning("Header from does not match envelope from")
+
+            if header_to != envelope.rcpt_tos[0]:
+                log.warning("Header to does not match envelope to")
+
+            await send_smtp(make_reply("Thank you for your message.", envelope.mail_from, 'Message received'), log)
+            log.info("Sent reply")
+            return '250 Message accepted for delivery'
+        except Exception as e:
+            log.error(e)
+            return '550 Message rejected'

core/server.py

@@ -10,8 +10,9 @@ import uvicorn
 django.setup()
 
 from helper import init_loop
-from lmtp.protocol import LMTPHandler
-from lmtp.socket import UnixSocketLMTPController
+from mail.protocol import LMTPHandler
+from mail.socket import UnixSocketLMTPController
+
 
 
 # async def handle_echo(reader, writer):