mail4one/pop3.py

@@ -2,8 +2,11 @@ import asyncio
 import contextlib
 import contextvars
 import logging
+import os
 import ssl
+import uuid
 from dataclasses import dataclass
+from hashlib import sha256
 from pathlib import Path
 from .config import User
 from .pwhash import parse_hash, check_pass, PWInfo

mail4one/server.py

@@ -1,6 +1,8 @@
 import asyncio
 import logging
+import os
 import ssl
+import sys
 from argparse import ArgumentParser
 from pathlib import Path
 from getpass import getpass

mail4one/smtp.py

@@ -1,5 +1,7 @@
 import asyncio
+import io
 import logging
+import mailbox
 import ssl
 import uuid
 import shutil
@@ -11,9 +13,11 @@ from email.message import Message
 import email.policy
 from email.generator import BytesGenerator
 import tempfile
+import random
 
-from aiosmtpd.handlers import AsyncMessage
+from aiosmtpd.handlers import Mailbox, AsyncMessage
-from aiosmtpd.smtp import SMTP
+from aiosmtpd.smtp import SMTP, DATA_SIZE_DEFAULT
+from aiosmtpd.smtp import SMTP as SMTPServer
 from aiosmtpd.smtp import Envelope as SMTPEnvelope
 from aiosmtpd.smtp import Session as SMTPSession
 
@@ -27,7 +31,7 @@ class MyHandler(AsyncMessage):
         self.mbox_finder = mbox_finder
 
     async def handle_DATA(
-        self, server: SMTP, session: SMTPSession, envelope: SMTPEnvelope
+        self, server: SMTPServer, session: SMTPSession, envelope: SMTPEnvelope
     ) -> str:
         self.rcpt_tos = envelope.rcpt_tos
         self.peer = session.peer

tests/test_pop.py

@@ -89,9 +89,6 @@ class TestPop3(unittest.IsolatedAsyncioTestCase):
         self.task = asyncio.create_task(pop_server.serve_forever())
         self.reader, self.writer = await asyncio.open_connection("127.0.0.1", 7995)
 
-        # Additional writers to close
-        self.ws: list[asyncio.StreamWriter] = []
-
     async def test_QUIT(self) -> None:
         dialog = """
         S: +OK Server Ready
@@ -136,7 +133,6 @@ class TestPop3(unittest.IsolatedAsyncioTestCase):
     async def test_dupe_AUTH(self) -> None:
         r1, w1 = await asyncio.open_connection("127.0.0.1", 7995)
         r2, w2 = await asyncio.open_connection("127.0.0.1", 7995)
-        self.ws += w1, w2
         dialog = """
         S: +OK Server Ready
         C: USER foobar
@@ -235,10 +231,8 @@ class TestPop3(unittest.IsolatedAsyncioTestCase):
 
     async def asyncTearDown(self) -> None:
         logging.debug("at teardown")
-        for w in self.ws + [self.writer]:
+        self.writer.close()
-            w.close()
+        await self.writer.wait_closed()
-            await w.wait_closed()
-        self.ws.clear()
         self.task.cancel("test done")
 
     async def dialog_checker(self, dialog: str) -> None: