Skip to content

milter: better line breaks for ARC-Authentication-Results #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
flowerysong merged 1 commit into from
May 13, 2026
Merged

milter: better line breaks for ARC-Authentication-Results #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ stamp-h1
.deps/*
*~
*.cache
*.swp
*#*
.venv
.vscode
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ All notable changes to this project will be documented in this file.

### Changed
* tests - migrated from manual "snapshots" to `inline-snapshot`.
* milter - `ARC-Authentication-Results` is returned with a linebreak before
the first resinfo.

### Fixed

Expand Down
7 changes: 5 additions & 2 deletions openarc/openarc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3835,8 +3835,9 @@ mlfi_eom(SMFICTX *ctx)

if (arc_dstring_len(afc->mctx_tmpstr) > 0)
{
arc_dstring_cat(afc->mctx_tmpstr, ";\n\t");
arc_dstring_cat(afc->mctx_tmpstr, ";");
}
arc_dstring_cat(afc->mctx_tmpstr, "\n\t");

arc_dstring_printf(afc->mctx_tmpstr, "%s=%s",
ares_getmethod(ar.ares_result[i].result_method),
Expand Down Expand Up @@ -3875,8 +3876,10 @@ mlfi_eom(SMFICTX *ctx)
{
if (arc_dstring_len(afc->mctx_tmpstr) > 0)
{
arc_dstring_cat(afc->mctx_tmpstr, ";\n\t");
arc_dstring_cat(afc->mctx_tmpstr, ";");
}
arc_dstring_cat(afc->mctx_tmpstr, "\n\t");

add_arc_authres(afc, conf, ipbuf);
}

Expand Down
10 changes: 8 additions & 2 deletions test/test_interop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ def test_dkimpy_sign(run_miltertest, private_key, dkimpy):
'ARC-Message-Signature',
IsStr(regex=r' i=2; d=example\.com; s=elpmaxe; a=rsa-sha256;\s+c=relaxed/simple; t=1234567890;\s+h=Subject:From:To;\s+(?s:.+)'),
],
['ARC-Authentication-Results', ' i=2; example.com; arc=pass header.oldest-pass=0 smtp.remote-ip=127.0.0.1'],
[
'ARC-Authentication-Results',
' i=2; example.com; \n\tarc=pass header.oldest-pass=0 smtp.remote-ip=127.0.0.1',
],
]
)

Expand Down Expand Up @@ -128,6 +131,9 @@ def test_perl_sign(run_miltertest, private_key, perl_mail_dkim):
'ARC-Message-Signature',
IsStr(regex=r' i=2; d=example.com; s=elpmaxe; a=rsa-sha256;\s+c=relaxed/simple; t=1234567890;\s+h=Subject:From:To;\s+(?s:.+)'),
],
['ARC-Authentication-Results', ' i=2; example.com; arc=pass header.oldest-pass=0 smtp.remote-ip=127.0.0.1'],
[
'ARC-Authentication-Results',
' i=2; example.com; \n\tarc=pass header.oldest-pass=0 smtp.remote-ip=127.0.0.1',
],
]
)
Loading