Show version on frontend. Add auto respond feature. Redesign flags on frontend. Bump version

Author: fkantelberg

.pre-commit-config.yaml

@@ -14,4 +14,13 @@ repos:
     rev: v1.3.0
     hooks:
       - id: mypy
-        args: [--disable-error-code, attr-defined, --disable-error-code, union-attr]
+        # args: [--disable-error-code, union-attr]
+        additional_dependencies:
+          - aiohttp
+          - aiosmtpd
+          - nox
+          - passlib
+          - pymap~=0.36
+          - pytest
+          - setuptools
+          - typing-extensions

pyproject.toml

@@ -18,4 +18,3 @@ skip-magic-trailing-comma = false
 line-ending = "auto"
 
 [tool.mypy]
-disable_error_code = 'attr-defined,import,union-attr'

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = mail-devel
-version = attr: mail_devel.VERSION
+version = attr: mail_devel.utils.VERSION
 author = Florian Kantelberg
 author_email = [email protected]
 description = IMAP and SMTP in memory test server

setup.py

@@ -1,3 +1,3 @@
-from setuptools import setup
+from setuptools import setup  # type: ignore
 
 setup()

src/mail_devel/__init__.py

@@ -1,3 +1,4 @@
 from .service import Service
+from .utils import VERSION
 
-VERSION = "0.11.0"
+__all__ = ["Service", "VERSION"]

src/mail_devel/auth.py

@@ -25,7 +25,7 @@ async def authenticate(self, credentials: ServerCredentials) -> Identity:
         if authcid not in self.users_dict:
             self.users_dict[authcid] = UserMetadata(self.config, authcid)
 
-        if self.multi_user:
+        if self.multi_user and isinstance(credentials, PlainCredentials):
             credentials = PlainCredentials(self.config.demo_user, credentials._secret)
 
         ident = await super().authenticate(credentials)

src/mail_devel/automation/__init__.py

@@ -0,0 +1,12 @@
+from email.message import Message
+from logging import Logger
+
+from mail_devel.builder import Builder
+from mail_devel.smtp import Reply
+
+
+def reply(message: Message, flags: set[str], _logger: Logger) -> Reply | None:
+    if "@mail-devel" not in message.get("References", ""):
+        return Reply(Builder.reply_mail(message), flags - {"Seen"})
+
+    return None

src/mail_devel/automation/reply_once.py

@@ -0,0 +1,47 @@
+import secrets
+import uuid
+from email.message import Message
+from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
+
+
+class Builder:
+    """Helper class to generate mails and randomized values"""
+
+    @staticmethod
+    def message_id() -> str:
+        return f"<{uuid.uuid4()}@mail-devel>"
+
+    @staticmethod
+    def mail_address() -> str:
+        return f"{secrets.token_hex(8)}@mail-devel"
+
+    @staticmethod
+    def reply_mail(message: Message) -> Message:
+        body = ""
+        if message.is_multipart():
+            for part in message.walk():
+                if part.get_content_type() == "text/plain":
+                    body = part.get_payload(decode=True).decode()
+        elif message.get_content_type() == "text/plain":
+            body = message.get_payload(decode=True).decode()
+
+        reply = MIMEMultipart()
+        if body:
+            body = "\n\n> " + body.replace("\n", "\n> ")
+
+        reply.attach(MIMEText("Reply" + body))
+
+        reply.add_header("Message-Id", Builder.message_id())
+        msg_id = message["Message-Id"]
+        if msg_id:
+            reply.add_header("In-Reply-To", msg_id)
+            reply.add_header("References", f"{msg_id} {message.get('References', '')}")
+
+        reply.add_header("Subject", f"Re: {message['Subject']}")
+        reply.add_header("To", message["From"])
+        reply.add_header("From", Builder.mail_address())
+        if message["CC"]:
+            reply.add_header("CC", message["CC"])
+
+        return reply

src/mail_devel/builder.py

@@ -7,6 +7,7 @@
 import uuid
 from email import header, message_from_bytes, message_from_string, policy
 from email.errors import MessageDefect
+from email.message import Message
 from email.mime.base import MIMEBase
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
@@ -16,11 +17,13 @@
 import aiohttp
 from aiohttp import web
 from aiohttp.web import Request, Response, WebSocketResponse
-from pymap.backend.dict.mailbox import Message
+from pymap.backend.dict.mailbox import Message as PyMapMessage
 from pymap.parsing.specials import FetchRequirement
 from pymap.parsing.specials.flag import Flag
 
+from .builder import Builder
 from .mailbox import TestMailboxDict
+from .utils import VERSION
 
 _logger = logging.getLogger(__name__)
 
@@ -54,6 +57,7 @@ async def run_app(
         ssl_context=ssl_context,
     )
     await site.start()
+    return app
 
 
 class Frontend:
@@ -94,7 +98,7 @@ def load_resource(self, resource: str) -> str:
 
         return res.read_text(encoding="utf-8")
 
-    async def start(self) -> None:
+    async def start(self) -> web.AppRunner:
         self.api = web.Application(client_max_size=self.client_max_size)
 
         self.api.add_routes(
@@ -168,7 +172,7 @@ async def _page_static(self, request: Request) -> Response:
             _logger.error(f"File {static!r} not in resources")
             raise web.HTTPNotFound() from e
 
-    async def _message_content(self, msg: Message) -> bytes:
+    async def _message_content(self, msg: PyMapMessage) -> bytes:
         return bytes((await msg.load_content(FetchRequirement.CONTENT)).content)
 
     def message_hash(self, content: bytes | str) -> str:
@@ -178,11 +182,20 @@ def message_hash(self, content: bytes | str) -> str:
         return hashlib.sha512(content).hexdigest()
 
     async def _convert_message(
-        self, msg: Message, *, account: str, mailbox: str, full: bool = False
+        self,
+        msg: PyMapMessage,
+        *,
+        account: str,
+        mailbox: str,
+        full: bool = False,
+        message: Message | None = None,
     ) -> dict:
-        content = await self._message_content(msg)
+        if not message:
+            content = await self._message_content(msg)
+            message = message_from_bytes(content)
+        else:
+            content = message.as_bytes()
 
-        message = message_from_bytes(content)
         result = {
             "uid": msg.uid,
             "flags": flags_to_api(msg.permanent_flags),
@@ -196,15 +209,15 @@ async def _convert_message(
         msg_hash = self.message_hash(content)
         self.mail_cache[msg_hash] = (account, mailbox, msg.uid)
 
-        result["attachments"] = []
+        attachments = []
         if message.is_multipart():
             for part in message.walk():
                 ctype = part.get_content_type()
                 cdispo = part.get_content_disposition()
 
                 if cdispo == "attachment":
                     name = part.get_filename()
-                    result["attachments"].append(
+                    attachments.append(
                         {"name": name, "url": f"/attachment/{msg_hash}/{name}"}
                     )
                 elif ctype == "text/plain":
@@ -216,6 +229,7 @@ async def _convert_message(
         else:
             result["body_plain"] = message.get_payload(decode=True).decode()
 
+        result["attachments"] = attachments
         result["content"] = bytes(content).decode()
         return result
 
@@ -226,6 +240,7 @@ async def on_config(self, ws: WebSocketResponse) -> None:
                 "data": {
                     "multi_user": self.multi_user,
                     "flagged_seen": self.flagged_seen,
+                    "version": VERSION,
                 },
             }
         )
@@ -315,9 +330,9 @@ async def on_random_mail(
     ) -> None:
         headers = {
             "subject": f"Random Subject [{secrets.token_hex(8)}]",
-            "message-id": f"{uuid.uuid4()}@mail-devel",
+            "message-id": Builder.message_id(),
             "to": account,
-            "from": f"{secrets.token_hex(8)}@mail-devel",
+            "from": Builder.mail_address(),
         }
         _logger.info("Randomized mail")
         await ws.send_json(
@@ -344,27 +359,17 @@ async def on_reply_mail(
 
         async for msg in mbox.messages():
             if msg.uid == uid:
+                content = await self._message_content(msg)
+                reply = Builder.reply_mail(message_from_bytes(content))
+
                 message = await self._convert_message(
                     msg,
                     account=account,
                     mailbox=mailbox,
                     full=True,
+                    message=reply,
                 )
 
-                headers = message["header"]
-                headers["subject"] = f"RE: {headers['subject']}"
-                msg_id = headers.get("message-id", None)
-                if msg_id:
-                    headers["in-reply-to"] = msg_id
-                    headers["references"] = f"{msg_id} {headers.get('references', '')}"
-                headers["message-id"] = f"{uuid.uuid4()}@mail-devel"
-                headers["to"] = headers["from"]
-                headers["from"] = self.user
-                headers.pop("content-type", None)
-                for key in list(headers):
-                    if key.startswith("x-"):
-                        headers.pop(key, None)
-
                 await ws.send_json(
                     {
                         "command": "reply_mail",
@@ -428,7 +433,7 @@ async def on_upload_mails(
                 msg = message_from_string(mail["data"], policy=compat_strict)
 
                 if not msg["Message-Id"] and self.ensure_message_id:
-                    msg.add_header("Message-Id", f"{uuid.uuid4()}@mail-devel")
+                    msg.add_header("Message-Id", Builder.message_id())
 
                 await self.mailboxes.append(
                     msg,
@@ -462,7 +467,7 @@ async def on_send_mail(
                 message.add_header(key.title(), value)
 
         if not message["Message-Id"] and self.ensure_message_id:
-            message.add_header("Message-Id", f"{uuid.uuid4()}@mail-devel")
+            message.add_header("Message-Id", Builder.message_id())
 
         for att in mail.get("attachments", []):
             part = MIMEBase(*(att["mimetype"] or "text/plain").split("/"))
@@ -514,8 +519,8 @@ async def _download_attachment(self, request: Request) -> Response:
                 return web.Response(
                     body=body,
                     headers={
-                        "Content-Type": part.get("Content-Type"),
-                        "Content-Disposition": part.get("Content-Disposition"),
+                        "Content-Type": part.get("Content-Type", ""),
+                        "Content-Disposition": part.get("Content-Disposition", ""),
                     },
                 )