Skip to content
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.

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

dmarc: fix handling if multiple records #73

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

mimi89999
Copy link
Contributor

I'm not sure if that many comment are needed. I'm also not sure if we should return a different error when there are multiple DMARC records.

dmarc/lookup.go Outdated
return Parse(dmarcRecords[0])
}

func IsDmarcRecord(txt string) bool {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to section 6.6.3, checking for the v= prefix should be enough.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But it states: that identifies the current version of DMARC
There is also:

   v: Version (plain-text; REQUIRED).  Identifies the record retrieved
      as a DMARC record.  It MUST have the value of "DMARC1".  The value
      of this tag MUST match precisely; if it does not or it is absent,
      the entire retrieved record MUST be ignored.  It MUST be the first
      tag in the list.

I believe that the current version is part of the statement as if there was a conjunction.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, matching only the v= would match SPF and DKIM records. That wouldn't make much sense.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that identifies the current version of DMARC

Hm, you're right. I'm not a fan of duplicating the parsing logic though. I'd suggest either matching on the v=DMARC1 prefix, or parsing all records for key-values.

Also, matching only the v= would match SPF and DKIM records. That wouldn't make much sense.

DMARC records are stored in a separate, special "_dmarc" subdomain, so that shouldn't be the case.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, you're right. I'm not a fan of duplicating the parsing logic though. I'd suggest either matching on the v=DMARC1 prefix, or parsing all records for key-values.

That would also match things like v=DMARC1.0 or v=DMARC10 that shouldn't be matched. We also can't simple match v=DMARC1; as leading and trailing spaces in the tag value should be ignored. I believe that the current logic is quite robust and makes sense.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@emersion I'm not quite sure how I should change the pull request. Could you please propose something more specific?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The current logic duplicates parsing, and I'd like to avoid this. parseParams() can be called instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the duplication now.

@emersion
Copy link
Owner

The DKIM side of this was fixed in b8ad33f, it seems like we forgot DMARC.

@mimi89999 mimi89999 requested a review from emersion February 7, 2025 12:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants