geos_one/bongo
1
0
Fork 0
Code Issues Pull Requests Actions 12 Packages Projects Releases 1 Wiki Activity

Preserve SMTP recipient addresses in quota DSNs
Debian Trixie package bundle / packages (push) Failing after 14m10s
Details

Browse Source
This commit is contained in:
Mario Fetka
2026-07-23 19:22:18 +02:00
parent 332521b38c
commit 2be3a0a180
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/testing/smtp-quota-dsn-check.py
+9 -1
View File
@@ -288,8 +288,16 @@ def main() -> int:
if item not in dsn_message
]
if missing:
status_lines = [
line.decode("utf-8", "replace")
for line in dsn_message.splitlines()
if line.lower().startswith(
(b"final-recipient:", b"action:", b"status:")
)
]
raise SmtpQuotaTestError(
f"quota DSN lacks required fields: {missing!r}"
f"quota DSN lacks required fields: {missing!r}; "
f"actual delivery status: {status_lines!r}"
)
if set(inbox_documents(recipient_store)) != set(recipient_before):
src/agents/smtp/smtpd.c
+11 -4
View File
@@ -1581,6 +1581,13 @@ HandleConnection (void *param)
goto QuitRcpt;
}
}
/*
* Preserve the SMTP envelope recipient for DSNs even
* when no explicit ORCPT parameter was supplied. The
* director may rewrite a local address to a bare Store
* username, which is not the final RFC 822 recipient
* address that the submitting client used.
*/
ReplyInt = strlen (name);
if (SMTPStringRequiresUTF8(name) &&
@@ -1699,7 +1706,7 @@ HandleConnection (void *param)
XplRWReadLockRelease (&ConfigLock);
snprintf (Answer, sizeof (Answer),
"QSTOR TO %s %s %lu\r\n", To,
Orcpt ? Orcpt : To,
Orcpt ? Orcpt : name,
RecipientDSNFlags & DSN_FLAGS);
Log(LOG_INFO, "Message from %s at host %s relayed to %s",
Client->AuthFrom?
@@ -1717,7 +1724,7 @@ HandleConnection (void *param)
To);
snprintf (Answer, sizeof (Answer),
"QSTOR TO %s %s %lu\r\n", To,
Orcpt ? Orcpt : To,
Orcpt ? Orcpt : name,
RecipientDSNFlags & DSN_FLAGS);
break;
}
@@ -1730,14 +1737,14 @@ HandleConnection (void *param)
XplRWReadLockRelease (&ConfigLock);
snprintf (Answer, sizeof (Answer),
"QSTOR LOCAL %s %s %lu\r\n",
To, Orcpt ? Orcpt : To,
To, Orcpt ? Orcpt : name,
RecipientDSNFlags & DSN_FLAGS);
} else {
XplRWReadLockRelease (&ConfigLock);
if (MsgAuthFindUser(To) == 0) {
snprintf (Answer, sizeof (Answer),
"QSTOR LOCAL %s %s %lu\r\n",
To, Orcpt ? Orcpt : To,
To, Orcpt ? Orcpt : name,
RecipientDSNFlags & DSN_FLAGS);
} else {
ConnWrite (Client->client.conn, MSG550NOTFOUND, MSG550NOTFOUND_LEN);