Skip to content

RequiredHeaders: distinguish "missing From field" and "multiple From fields" #205

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

RequiredHeaders: distinguish "missing From field" and "multiple From fields" #205

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
16 changes: 10 additions & 6 deletions opendmarc/opendmarc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2405,13 +2405,17 @@ mlfi_eom(SMFICTX *ctx)
from = dmarcf_findheader(dfc, "From", 0);

/* verify RFC5322-required headers (RFC5322 3.6) */
if (from == NULL ||
dmarcf_findheader(dfc, "From", 1) != NULL)
reqhdrs_error = "not exactly one From field";
if (from == NULL)
reqhdrs_error = "missing From field";

if (dmarcf_findheader(dfc, "From", 1) != NULL)
reqhdrs_error = "multiple From fields";

if (dmarcf_findheader(dfc, "Date", 0) == NULL)
reqhdrs_error = "missing Date field";

if (dmarcf_findheader(dfc, "Date", 0) == NULL ||
dmarcf_findheader(dfc, "Date", 1) != NULL)
reqhdrs_error = "not exactly one Date field";
if (dmarcf_findheader(dfc, "Date", 1) != NULL)
reqhdrs_error = "multiple Date fields";

if (dmarcf_findheader(dfc, "Reply-To", 1) != NULL)
reqhdrs_error = "multiple Reply-To fields";
Expand Down