Skip to content

Commit

Permalink
Fix #1474 - Check for URI scheme in DMARC parser (#1493)
Browse files Browse the repository at this point in the history
This also adds some small unit tests for DMARC parsing.
  • Loading branch information
uwekamper authored Jan 13, 2025
1 parent dd6e4ba commit 91564e2
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 1 deletion.
4 changes: 3 additions & 1 deletion checks/tasks/dmarc_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,11 @@ def _check_dmarc_uri(tokens):
uri, numeric = uri.split("!")
dmarc_uri_numeric.parseString(numeric)
try:
urlparse(uri)
parsed_url = urlparse(uri)
except ValueError:
raise ParseException("Could not parse URI.")
if parsed_url.scheme == "":
raise ParseException("URI scheme is missing (mailto:).")
return None


Expand Down
30 changes: 30 additions & 0 deletions checks/test/test_dmarc_parser.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Copyright: 2024, ECP, NLnet Labs and the Internet.nl contributors
# SPDX-License-Identifier: Apache-2.0
import pytest
from pyparsing import ParseException

from checks.tasks.dmarc_parser import _check_dmarc_uri, parse


def test__check_dmarc_uri():
"""
Check if None is returned on valid URI
"""
assert _check_dmarc_uri(["mailto:[email protected]"]) is None


def test__check_dmarc_uri_detect_missing_uri_scheme():
"""
Many people forget to add the mailto: scheme to their DMARC URI.
This common error should be detected.
"""
with pytest.raises(ParseException):
_check_dmarc_uri(["[email protected]"])


def test_parse():
sample_record = "v=DMARC1; p=none; rua=mailto:[email protected]"
result = parse(sample_record)
assert result.version == "v=DMARC1"
assert result.directives.request == "p=none"
assert result.directives.auri == "rua=mailto:[email protected]"

0 comments on commit 91564e2

Please sign in to comment.