Files
webmail-client/backend/app/providers/imap_smtp/parsing.py
T
lukasandClaude Opus 4.8 4d5a30cffb sync: QRESYNC VANISHED expunge detection (SPEC §6.3 M2 fast resync)
Server-side deletions now propagate to the DB. Previously poll() detected new
messages and CONDSTORE flag deltas but never expunges (the old TODO), so mail
deleted in another client lingered as phantoms outside the small Drafts reconcile.

- provider: enable QRESYNC when advertised (_maybe_enable_qresync + qresync_enabled
  property). poll() harvests VANISHED (expunged UIDs) and changed FLAGS in one pass
  via a raw `SELECT <mbox> (QRESYNC (uidvalidity modseq))` — issued as a low-level
  SELECT because aioimaplib only surfaces untagged VANISHED lines on a sync command,
  not on an async UID FETCH. CONDSTORE-only servers (e.g. Gmail) keep the CHANGEDSINCE
  flag delta and fall back to the engine reconcile.
- parsing: parse_vanished() for `VANISHED [(EARLIER)] <uid-set>` with range expansion.
- engine: apply_delta now drops expunged rows from the search index, un-links any
  local draft mirroring a vanished UID, and publishes message.deleted for the UI.
- tests: parse_vanished unit cases + apply_delta expunge (removal, draft un-link,
  modseq advance).

Verified live: the worker issues `SELECT "INBOX" (QRESYNC (uidvalidity modseq))`
against QRESYNC-capable accounts. ruff + mypy --strict clean; 296 tests pass.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Rcj3TpydMTzTSmU7kunzf8
2026-07-26 18:28:09 +02:00

201 lines
6.7 KiB
Python

"""Pure parsing helpers for IMAP responses (unit-testable, no I/O).
aioimaplib returns responses as lists of ``bytes``/``bytearray`` lines. A FETCH
with ``BODY[]`` yields, per message, a header line ending ``... {<size>}`` followed
by a ``bytearray`` literal, then a lone ``)``. LIST lines carry SPECIAL-USE flags.
"""
from __future__ import annotations
import re
from dataclasses import dataclass
from datetime import datetime
from imapclient.imap_utf7 import decode as imap_utf7_decode
# --- SPECIAL-USE mapping (SPEC §4 special_use values) -----------------------
_SPECIAL_USE_FLAGS = {
"\\sent": "sent",
"\\drafts": "drafts",
"\\trash": "trash",
"\\junk": "junk",
"\\archive": "archive",
"\\all": "archive", # Gmail "All Mail" acts as archive
}
_LIST_RE = re.compile(rb'^\(([^)]*)\)\s+(?:"([^"]*)"|NIL)\s+(.+)$')
_UID_RE = re.compile(rb"UID\s+(\d+)")
_FLAGS_RE = re.compile(rb"FLAGS\s+\(([^)]*)\)")
_INTERNALDATE_RE = re.compile(rb'INTERNALDATE\s+"([^"]+)"')
_LITERAL_RE = re.compile(rb"\{(\d+)\}\s*$")
_FETCH_HEADER_RE = re.compile(rb"^\d+\s+FETCH\s+\(", re.IGNORECASE)
@dataclass(frozen=True)
class ParsedMailbox:
path: str
special_use: str | None
@dataclass(frozen=True)
class ParsedFetch:
uid: int
flags: frozenset[str]
internal_date: datetime | None
raw: bytes | None # None when the fetch did not request the body
def _decode_mailbox_name(raw: bytes) -> str:
name = raw.strip()
if name.startswith(b'"') and name.endswith(b'"'):
name = name[1:-1]
# IMAP mailbox names are modified UTF-7 (SPEC §4: store UTF-7 decoded).
return str(imap_utf7_decode(bytes(name)))
def parse_list_line(line: bytes) -> ParsedMailbox | None:
"""Parse one LIST response line into a :class:`ParsedMailbox` (or None)."""
m = _LIST_RE.match(line.strip())
if not m:
return None
flags = m.group(1).lower().split()
name = _decode_mailbox_name(m.group(3))
special: str | None = None
for flag in flags:
mapped = _SPECIAL_USE_FLAGS.get(flag.decode("ascii", "ignore"))
if mapped:
special = mapped
break
if special is None and name.upper() == "INBOX":
special = "inbox"
return ParsedMailbox(path=name, special_use=special)
def parse_internaldate(raw: bytes | str) -> datetime | None:
"""Parse an IMAP INTERNALDATE (``d-Mon-Y H:M:S +ZZZZ``) to an aware datetime."""
text = raw.decode("ascii", "ignore") if isinstance(raw, bytes) else raw
text = text.strip()
try:
return datetime.strptime(text, "%d-%b-%Y %H:%M:%S %z")
except ValueError:
return None
def _parse_flag_token(tok: bytes) -> str:
return tok.decode("ascii", "ignore")
def parse_fetch_header(line: bytes) -> tuple[int | None, frozenset[str], datetime | None]:
"""Extract (uid, flags, internaldate) from a FETCH header line."""
uid_m = _UID_RE.search(line)
uid = int(uid_m.group(1)) if uid_m else None
flags_m = _FLAGS_RE.search(line)
if flags_m:
flags = frozenset(_parse_flag_token(t) for t in flags_m.group(1).split())
else:
flags = frozenset()
date_m = _INTERNALDATE_RE.search(line)
internal = parse_internaldate(date_m.group(1)) if date_m else None
return uid, flags, internal
def parse_fetch_lines(lines: list[bytes | bytearray]) -> list[ParsedFetch]:
"""Walk a full FETCH response, returning one :class:`ParsedFetch` per message.
Handles both metadata-only fetches (FLAGS/INTERNALDATE) and body fetches
(a ``{size}`` literal announced on the header line, body on the next line).
"""
results: list[ParsedFetch] = []
i = 0
n = len(lines)
while i < n:
line = lines[i]
if not isinstance(line, (bytes, bytearray)) or not _FETCH_HEADER_RE.match(bytes(line)):
i += 1
continue
header = bytes(line)
uid, flags, internal = parse_fetch_header(header)
raw: bytes | None = None
if _LITERAL_RE.search(header) and i + 1 < n:
body = lines[i + 1]
raw = bytes(body)
i += 2
# Skip the trailing ")" continuation line if present.
if (
i < n
and isinstance(lines[i], (bytes, bytearray))
and bytes(lines[i]).strip() == b")"
):
i += 1
else:
i += 1
if uid is not None:
results.append(ParsedFetch(uid=uid, flags=flags, internal_date=internal, raw=raw))
return results
_VANISHED_RE = re.compile(rb"^VANISHED\s+(?:\(EARLIER\)\s+)?(\S+)", re.IGNORECASE)
def _expand_uid_set(token: bytes) -> list[int]:
"""Expand an IMAP uid-set (``1,3:5,9``) to a flat list of ints (``*`` skipped)."""
out: list[int] = []
for part in token.split(b","):
part = part.strip()
lo_b, sep, hi_b = part.partition(b":")
if sep:
if lo_b.isdigit() and hi_b.isdigit():
lo, hi = int(lo_b), int(hi_b)
out.extend(range(min(lo, hi), max(lo, hi) + 1))
elif part.isdigit():
out.append(int(part))
return out
def parse_vanished(lines: list[bytes | bytearray]) -> list[int]:
"""UIDs from QRESYNC ``VANISHED [(EARLIER)] <uid-set>`` responses (RFC 7162).
aioimaplib strips the leading ``* `` before buffering the line, so we match on
the bare ``VANISHED`` token. Both the SELECT-time ``(EARLIER)`` form and the
live-expunge form are accepted.
"""
out: list[int] = []
for line in lines:
if not isinstance(line, (bytes, bytearray)):
continue
m = _VANISHED_RE.match(bytes(line).strip())
if m:
out.extend(_expand_uid_set(m.group(1)))
return out
def parse_search_uids(lines: list[bytes | bytearray]) -> list[int]:
"""Parse a UID SEARCH response's first line into a list of ints."""
if not lines:
return []
first = lines[0]
if not isinstance(first, (bytes, bytearray)):
return []
return [int(tok) for tok in bytes(first).split() if tok.isdigit()]
def parse_select_untagged(lines: list[bytes | bytearray]) -> dict[str, int]:
"""Extract UIDVALIDITY / UIDNEXT / HIGHESTMODSEQ / EXISTS from SELECT lines."""
out: dict[str, int] = {}
patterns = {
"uidvalidity": re.compile(rb"UIDVALIDITY\s+(\d+)"),
"uidnext": re.compile(rb"UIDNEXT\s+(\d+)"),
"highestmodseq": re.compile(rb"HIGHESTMODSEQ\s+(\d+)"),
"exists": re.compile(rb"^(\d+)\s+EXISTS"),
}
for line in lines:
if not isinstance(line, (bytes, bytearray)):
continue
b = bytes(line)
for key, pat in patterns.items():
m = pat.search(b)
if m:
out[key] = int(m.group(1))
return out