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

- Fixes dotse/zonemaster-engine#275 #311

Merged
merged 4 commits into from Dec 7, 2017
Jump to file or symbol
Failed to load files and symbols.
+17 −14
Diff settings

Always

Just for now

@@ -1,6 +1,6 @@
package Zonemaster::Engine::Test::Nameserver;
use version; our $VERSION = version->declare("v1.0.9");
use version; our $VERSION = version->declare("v1.0.12");
use strict;
use warnings;
@@ -141,7 +141,7 @@ sub translation {
'QUERY_DROPPED' => 'Nameserver {ns}/{address} dropped AAAA query.',
'IS_A_RECURSOR' => 'Nameserver {ns}/{address} is a recursor.',
'NO_RECURSOR' => 'None of the following nameservers is a recursor : {names}.',
'RECURSIVITY_UNDEF' => 'Can not determine nameservers recursivity.',
'RECURSIVITY_UNDEF' => 'Cannot determine if the following servers are recursive nameservers or not: {names}.',
'ANSWER_BAD_RCODE' => 'Nameserver {ns}/{address} answered AAAA query with an unexpected rcode ({rcode}).',
'EDNS0_BAD_ANSWER' => 'Nameserver {ns}/{address} does not support EDNS0 (OPT not set in reply).',
'EDNS0_SUPPORT' => 'The following nameservers support EDNS0 : {names}.',
@@ -183,7 +183,8 @@ sub nameserver01 {
my @existing_tld = qw{fr re pm tf yt wf si};
my @results;
my %ips;
my %nsnames;
my %nsnames_and_ip;
my %is_not_recursor = ();
foreach
@@ -221,7 +222,7 @@ sub nameserver01 {
elsif ( not $p->is_redirect and not $p->aa and not $p->answer and $p->rcode eq q{NOERROR} ) {
$is_not_recursor{ $local_ns->address->short }++;
}
$nsnames{ $local_ns->name }++;
$nsnames_and_ip{ $local_ns->name->string . q{/} . $local_ns->address->short }++;
$ips{ $local_ns->address->short }++;
}
@@ -233,7 +234,7 @@ sub nameserver01 {
push @results,
info(
NO_RECURSOR => {
names => join( q{,}, sort keys %nsnames ),
names => join( q{,}, sort keys %nsnames_and_ip ),
}
);
}
@@ -280,7 +281,7 @@ sub nameserver01 {
elsif ( not $p->is_redirect and not $p->aa and not $p->answer and $p->rcode eq q{NOERROR} ) {
$is_not_recursor{ $local_ns->address->short }++;
}
$nsnames{ $local_ns->name }++;
$nsnames_and_ip{ $local_ns->name->string . q{/} . $local_ns->address->short }++;
$ips{ $local_ns->address->short }++;
}
}
@@ -291,7 +292,7 @@ sub nameserver01 {
push @results,
info(
NO_RECURSOR => {
names => join( q{,}, sort keys %nsnames ),
names => join( q{,}, sort keys %nsnames_and_ip ),
}
);
last;
@@ -305,7 +306,9 @@ sub nameserver01 {
if ( not grep { $_->tag eq q{IS_A_RECURSOR} } @results and not grep { $_->tag eq q{NO_RECURSOR} } @results ) {
push @results,
info(
RECURSIVITY_UNDEF => {}
RECURSIVITY_UNDEF => {
names => join( q{,}, sort keys %nsnames_and_ip ),
}
);
}
}
View
@@ -650,8 +650,8 @@ msgid "None of the following nameservers is a recursor : {names}."
msgstr "None of the following nameservers is a recursor : {names}."
#: NAMESERVER:RECURSIVITY_UNDEF
msgid "Can not determine nameservers recursivity."
msgstr "Can not determine nameservers recursivity."
msgid "Cannot determine if the following servers are recursive nameservers or not: {names}."
msgstr "Cannot determine if the following servers are recursive nameservers or not: {names}."
#: NAMESERVER:NO_RESOLUTION
msgid "No nameservers succeeded to resolve to an IP address."
View
@@ -643,8 +643,8 @@ msgid "None of the following nameservers is a recursor : {names}."
msgstr "Aucun des serveurs de noms suivants n'est récursif : {names}."
#: NAMESERVER:RECURSIVITY_UNDEF
msgid "Can not determine nameservers recursivity."
msgstr "Impossible de déterminer si les serveurs sont récursifs ou non."
msgid "Cannot determine if the following servers are recursive nameservers or not: {names}."
msgstr "Impossible de déterminer si les serveurs suivants sont récursifs ou non : {names}."
#: NAMESERVER:QUERY_DROPPED
msgid "Nameserver {ns}/{address} dropped AAAA query."
View
@@ -646,8 +646,8 @@ msgid "None of the following nameservers is a recursor : {names}."
msgstr "Ingen av följande namnservrar är en rekursiv resolver: {names}."
#: NAMESERVER:RECURSIVITY_UNDEF
msgid "Can not determine nameservers recursivity."
msgstr "Det går inte att fastställa om namnservern är en rekursiv resolver eller inte."
msgid "Cannot determine if the following servers are recursive nameservers or not: {names}."
msgstr "Det går inte att fastställa om namnservern är en rekursiv resolver eller inte: {names}."
#: NAMESERVER:NO_RESOLUTION
msgid "No nameservers succeeded to resolve to an IP address."
ProTip! Use n and p to navigate between commits in a pull request.