fix: odysseus-mail read crashes on an empty IMAP fetch payload (#1730)

This commit is contained in:
Afonso Coutinho
2026-06-03 05:31:10 +01:00
committed by GitHub
parent c5bc39de88
commit d9e6071528
2 changed files with 64 additions and 1 deletions

View File

@@ -190,7 +190,7 @@ def cmd_read(args) -> None:
if st != "OK": if st != "OK":
fail(f"select {args.folder!r} failed: {st}") fail(f"select {args.folder!r} failed: {st}")
st, msg_data = conn.fetch(args.uid.encode(), "(BODY.PEEK[])") st, msg_data = conn.fetch(args.uid.encode(), "(BODY.PEEK[])")
if st != "OK": if st != "OK" or not msg_data or not msg_data[0]:
fail(f"fetch UID {args.uid} failed: {st}") fail(f"fetch UID {args.uid} failed: {st}")
raw = msg_data[0][1] raw = msg_data[0][1]
msg = email_mod.message_from_bytes(raw) msg = email_mod.message_from_bytes(raw)

View File

@@ -0,0 +1,63 @@
import importlib.machinery
import importlib.util
import sys
from pathlib import Path
from types import ModuleType, SimpleNamespace
import pytest
class _Conn:
def select(self, folder, readonly=True):
return "OK", [b"1"]
def fetch(self, uid, spec):
# IMAP can return OK with an empty payload (UID expunged mid-session).
return "OK", []
class _ImapCtx:
def __init__(self, account):
pass
def __enter__(self):
return _Conn()
def __exit__(self, *a):
return False
def _load_mail_cli(monkeypatch):
helpers = ModuleType("routes.email_helpers")
helpers._imap = _ImapCtx
helpers._get_email_config = lambda account=None: {}
helpers._decode_header = lambda value: value
helpers._extract_text = lambda msg: ""
helpers._extract_html = lambda msg: ""
helpers._list_attachments_from_msg = lambda msg: []
pollers = ModuleType("routes.email_pollers")
pollers._scheduled_poll_once = lambda: {}
pollers._run_auto_summarize_once = lambda **kwargs: ""
core_mod = ModuleType("core")
database_mod = ModuleType("core.database")
database_mod.SessionLocal = object
database_mod.EmailAccount = object
monkeypatch.setitem(sys.modules, "routes.email_helpers", helpers)
monkeypatch.setitem(sys.modules, "routes.email_pollers", pollers)
monkeypatch.setitem(sys.modules, "core", core_mod)
monkeypatch.setitem(sys.modules, "core.database", database_mod)
path = Path(__file__).resolve().parent.parent / "scripts" / "odysseus-mail"
loader = importlib.machinery.SourceFileLoader("odysseus_mail_cli_read_test", str(path))
spec = importlib.util.spec_from_loader(loader.name, loader)
module = importlib.util.module_from_spec(spec)
loader.exec_module(module)
return module
def test_cmd_read_handles_empty_fetch_payload(monkeypatch):
cli = _load_mail_cli(monkeypatch)
args = SimpleNamespace(account="acc", folder="INBOX", uid="5", html=False)
# old code did raw = msg_data[0][1] on the empty list and raised IndexError;
# the guard turns it into a clean fail() (SystemExit).
with pytest.raises(SystemExit):
cli.cmd_read(args)