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.

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

New implementation of Nameserver11 - #1110 #1034

Merged
merged 6 commits into from
Dec 1, 2022
Merged

New implementation of Nameserver11 - #1110 #1034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
872e2fc
#993 - Update message tags
tgreenx Aug 31, 2022
ae18ffc
#993 - Update Nameserver11 implementation
tgreenx Aug 31, 2022
0c99cb6
#993 - Fix message argument
tgreenx Sep 1, 2022
a555074
#993 - Fix message tag name
tgreenx Sep 1, 2022
5cc0f15
#1110 - Update code to new specification
tgreenx Nov 17, 2022
4de0078
#1110 - Add unitary test
tgreenx Nov 22, 2022
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
131 changes: 101 additions & 30 deletions lib/Zonemaster/Engine/Test/Nameserver.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,12 @@ sub metadata {
],
nameserver11 => [
qw(
NO_RESPONSE
NO_EDNS_SUPPORT
UNKNOWN_OPTION_CODE
NS_ERROR
N11_NO_EDNS
N11_NO_RESPONSE
N11_RETURNS_UNKNOWN_OPTION_CODE
N11_UNEXPECTED_ANSWER_SECTION
N11_UNEXPECTED_RCODE
N11_UNSET_AA
TEST_CASE_END
TEST_CASE_START
)
Expand Down Expand Up @@ -351,17 +353,41 @@ Readonly my %TAG_DESCRIPTIONS => (
__x # NAMESERVER:NS_ERROR
'Erroneous response from nameserver {ns}.', @_;
},
N10_EDNS_RESPONSE_ERROR => sub {
__x # NAMESERVER:N10_EDNS_RESPONSE_ERROR
'Expected RCODE but received erroneous response to an EDNS version 1 query. Fetched from the nameservers with IP addresses {ns_ip_list}', @_;
},
N10_NO_RESPONSE_EDNS1_QUERY => sub {
__x # N10_NO_RESPONSE_EDNS1_QUERY
__x # NAMESERVER:N10_NO_RESPONSE_EDNS1_QUERY
'No response to an EDNS version 1 query. Fetched from the nameservers with IP addresses {ns_ip_list}', @_;
},
N10_UNEXPECTED_RCODE => sub {
__x # N10_UNEXPECTED_RCODE
__x # NAMESERVER:N10_UNEXPECTED_RCODE
'Erroneous RCODE ("{rcode}") in response to an EDNS version 1 query. Fetched from the nameservers with IP addresses {ns_ip_list}', @_;
},
N10_EDNS_RESPONSE_ERROR => sub {
__x # N10_EDNS_RESPONSE_ERROR
'Expected RCODE but received erroneous response to an EDNS version 1 query. Fetched from the nameservers with IP addresses {ns_ip_list}', @_;
N11_NO_EDNS => sub {
__x # NAMESERVER:N11_N11_NO_EDNS
'The DNS response, on query with unknown EDNS option-code, does not contain any EDNS from name servers "{ns_ip_list}".', @_;
},
N11_NO_RESPONSE => sub {
__x # NAMESERVER:N11_NO_RESPONSE
'There is no response on query with unknown EDNS option-code from name servers "{ns_ip_list}".', @_;
},
N11_RETURNS_UNKNOWN_OPTION_CODE => sub {
__x # NAMESERVER:N11_RETURNS_UNKNOWN_OPTION_CODE
'The DNS response contains an unknown EDNS option-code. Returned from name servers "{ns_ip_list}".', @_;
},
N11_UNEXPECTED_ANSWER_SECTION => sub {
__x # NAMESERVER:N11_UNEXPECTED_ANSWER_SECTION
'The DNS response, on query with unknown EDNS option-code, does not contain the expected SOA record in the answer section from name servers "{ns_ip_list}".', @_;
},
N11_UNEXPECTED_RCODE => sub {
__x # NAMESERVER:N11_UNEXPECTED_RCODE
'The DNS response, on query with unknown EDNS option-code, has unexpected RCODE name "{rcode}" from name servers "{ns_ip_list}".', @_;
},
N11_UNSET_AA => sub {
__x # NAMESERVER:N11_UNSET_AA
'The DNS response, on query with unknown EDNS option-code, is unexpectedly not authoritative from name servers "{ns_ip_list}".', @_;
},
QNAME_CASE_INSENSITIVE => sub {
__x # NAMESERVER:QNAME_CASE_INSENSITIVE
Expand Down Expand Up @@ -1077,44 +1103,89 @@ sub nameserver11 {
my ( $class, $zone ) = @_;
push my @results, info( TEST_CASE_START => { testcase => (split /::/, (caller(0))[3])[-1] } );

my @no_response;
my %unexpected_rcode;
my @no_edns;
my @unexpected_answer;
my @unset_aa;
my @unknown_opt_code;

# Choose an unassigned EDNS0 Option Codes
# values 15-26945 are Unassigned. Let's say we use 137 ???
my $opt_code = 137;
my $opt_data = q{};
my $opt_length = length($opt_data);
my $rdata = $opt_code*65536 + $opt_length;

my @nss = @{ Zonemaster::Engine::TestMethods->method4and5( $zone ) };

for my $ns ( @nss ) {
foreach my $ns ( @{ Zonemaster::Engine::TestMethods->method4and5( $zone ) } ) {

next if ( _ip_disabled_message( \@results, $ns, q{SOA} ) );

my $p = $ns->query( $zone->name, q{SOA}, { edns_details => { data => $rdata } } );
#To be changed to '$ns->query( $zone->name, q{SOA}, { edns_details => { version => 0 } } );' when PR#1147 is merged.
my $p = $ns->query( $zone->name, q{SOA}, { edns_details => { udp_size => 512 } } );

if ( not $p or not $p->has_edns or $p->rcode ne q{NOERROR} or not $p->aa or not $p->get_records_for_name(q{SOA}, $zone->name, q{answer}) ){
next;
}

#To be changed to '$ns->query( $zone->name, q{SOA}, { edns_details => { data => $rdata } } );' when PR#1147 is merged.
$p = $ns->query( $zone->name, q{SOA}, { edns_details => { data => $rdata, udp_size => 512 } } );

if ( $p ) {
if ( $p->rcode eq q{FORMERR} and not $p->edns_rcode ) {
push @results, info( NO_EDNS_SUPPORT => { ns => $ns->string } );
if ( $p->rcode ne q{NOERROR} ){
push @{ $unexpected_rcode{$p->rcode} }, $ns->address->short;
}
elsif ( defined $p->edns_data ) {
push @results, info( UNKNOWN_OPTION_CODE => { ns => $ns->string } );

elsif ( not $p->has_edns ){
push @no_edns, $ns->address->short;
}
elsif ( $p->rcode eq q{NOERROR} and not $p->edns_rcode and $p->edns_version == 0 and not defined $p->edns_data and $p->get_records( q{SOA}, q{answer} ) ) {
next;

elsif ( not $p->get_records_for_name(q{SOA}, $zone->name, q{answer}) ){
push @unexpected_answer, $ns->address->short;
}
else {
push @results, info( NS_ERROR => { ns => $ns->string, } );

elsif ( not $p->aa ){
push @unset_aa, $ns->address->short;
}

elsif ( defined $p->edns_data ) {
Copy link
Member

Choose a reason for hiding this comment

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

This check is more general than what is prescribed in the specification. It doesn't seem like a huge deal, but I wanted to point it out.

Copy link
Contributor

Choose a reason for hiding this comment

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

I looked at that, and since the query has no flags and no other options in EDNS, besides the undefined option, which the server is expected to ignore and not include in the response, I think this should work.

push @unknown_opt_code, $ns->address->short;
}
}
else {
push @results,
info(
NO_RESPONSE => {
ns => $ns->string,
domain => $zone->name,
}
);
else{
push @no_response, $ns->address->short;
}
}

if ( scalar @no_response ){
push @results, info( N11_NO_RESPONSE => { ns_ip_list => join( q{;}, uniq sort @no_response ) } );
}

if ( scalar keys %unexpected_rcode ){
push @results, map {
info(
N11_UNEXPECTED_RCODE => {
rcode => $_,
ns_ip_list => join( q{;}, uniq sort @{ $unexpected_rcode{$_} } )
}
)
} keys %unexpected_rcode;
}

if ( scalar @no_edns ){
push @results, info( N11_NO_EDNS => { ns_ip_list => join( q{;}, uniq sort @no_edns ) } );
}

if ( scalar @unexpected_answer ){
push @results, info( N11_UNEXPECTED_ANSWER_SECTION => { ns_ip_list => join( q{;}, uniq sort @unexpected_answer ) } );
}

if ( scalar @unset_aa ){
push @results, info( N11_UNSET_AA => { ns_ip_list => join( q{;}, uniq sort @unset_aa ) } );
}

if ( scalar @unknown_opt_code ){
push @results, info( N11_RETURNS_UNKNOWN_OPTION_CODE => { ns_ip_list => join( q{;}, uniq sort @unknown_opt_code ) } );
}

return ( @results, info( TEST_CASE_END => { testcase => (split /::/, (caller(0))[3])[-1] } ) );
Expand Down Expand Up @@ -1169,7 +1240,7 @@ sub nameserver13 {

next if ( _ip_disabled_message( \@results, $ns, q{SOA} ) );

my $p = $ns->query( $zone->name, q{SOA}, { usevc => 0, fallback => 0, edns_details => { do => 1, udp_size => 512 } } );
my $p = $ns->query( $zone->name, q{SOA}, { usevc => 0, fallback => 0, edns_details => { do => 1, udp_size => 512 } } );
if ( $p ) {
if ( $p->rcode eq q{FORMERR} and not $p->edns_rcode ) {
push @results, info( NO_EDNS_SUPPORT => { ns => $ns->string, } );
Expand Down
6 changes: 6 additions & 0 deletions share/profile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,12 @@
"N10_NO_RESPONSE_EDNS1_QUERY" : "WARNING",
"N10_UNEXPECTED_RCODE" : "WARNING",
"N10_EDNS_RESPONSE_ERROR" : "WARNING",
"N11_NO_EDNS" : "WARNING",
"N11_NO_RESPONSE" : "WARNING",
"N11_RETURNS_UNKNOWN_OPTION_CODE" : "WARNING",
"N11_UNEXPECTED_ANSWER_SECTION" : "WARNING",
"N11_UNEXPECTED_RCODE" : "WARNING",
"N11_UNSET_AA" : "WARNING",
"QNAME_CASE_INSENSITIVE" : "WARNING",
"QNAME_CASE_SENSITIVE" : "INFO",
"QUERY_DROPPED" : "NOTICE",
Expand Down
Loading