Skip to content

fix mx limit 10 hops test #32

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
bigio wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix mx limit 10 hops test #32

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
12 changes: 9 additions & 3 deletions lib/Mail/SPF/Mech/MX.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,15 @@ sub match {
my @mx_rrs = $mx_packet->answer
or $server->count_void_dns_lookup($request);

# Respect the MX mechanism lookups limit (RFC 4408, 5.4/3/4):
@mx_rrs = splice(@mx_rrs, 0, $server->max_name_lookups_per_mx_mech)
if defined($server->max_name_lookups_per_mx_mech);
# RFC 7208 §4.6.4/2: more than 10 MX records is a permerror.
if (
defined($server->max_name_lookups_per_mx_mech) and
@mx_rrs > $server->max_name_lookups_per_mx_mech
) {
throw Mail::SPF::EProcessingLimitExceeded(
sprintf("Maximum MX look-ups limit (%d) exceeded",
$server->max_name_lookups_per_mx_mech));
}

# TODO Use A records from packet's "additional" section? Probably not.

Expand Down
4 changes: 3 additions & 1 deletion t/10.00-rfc4408.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ plan(skip_all => "Mail::SPF::Test required for testing Mail::SPF's RFC complianc

require('t/Mail-SPF-Test-lib.pm');

run_spf_test_suite_file('t/rfc4408-tests.yml');
run_spf_test_suite_file('t/rfc4408-tests.yml', {
'mx-limit' => 'SKIP: RFC 4408 was ambiguous on this; RFC 7208 clarified it as permerror'
});
24 changes: 12 additions & 12 deletions t/rfc7208-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2417,18 +2417,18 @@ tests:
host: 1.2.3.4
mailfrom: foo@e2.example.com
result: permerror
#mx-limit:
# description: >-
# there MUST be a limit of no more than 10 MX looked up and checked.
# comment: >-
# The required result for this test was the subject of much controversy
# with RFC4408. For RFC7208 the ambiguity was resolved in favor of
# producing a permerror result.
# spec: 4.6.4/2
# helo: mail.example.com
# host: 1.2.3.5
# mailfrom: foo@e4.example.com
# result: permerror
mx-limit:
description: >-
there MUST be a limit of no more than 10 MX looked up and checked.
comment: >-
The required result for this test was the subject of much controversy
with RFC4408. For RFC7208 the ambiguity was resolved in favor of
producing a permerror result.
spec: 4.6.4/2
helo: mail.example.com
host: 1.2.3.5
mailfrom: foo@e4.example.com
result: permerror
ptr-limit:
description: >-
there MUST be a limit of no more than 10 PTR looked up and checked.
Expand Down
Loading