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

Jump to bottom

closes dotse/zonemaster-engine#296 #346

Merged
merged 2 commits into from Nov 27, 2017
Merged

closes dotse/zonemaster-engine#296 #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dcd002
closes dotse/zonemaster-engine#296
vlevigneron Nov 17, 2017
9f587ab
Increase version number.
vlevigneron Nov 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 1 addition & 30 deletions lib/Zonemaster/Engine/Test/Delegation.pm
View file
Open in desktop
@@ -1,6 +1,6 @@
package Zonemaster::Engine::Test::Delegation;

use version; our $VERSION = version->declare("v1.0.7");
use version; our $VERSION = version->declare("v1.0.8");

use strict;
use warnings;
Expand Down Expand Up @@ -52,8 +52,6 @@ sub metadata {
NOT_ENOUGH_NS_GLUE
ENOUGH_NS
NOT_ENOUGH_NS
ENOUGH_NS_TOTAL
NOT_ENOUGH_NS_TOTAL
)
],
delegation02 => [
Expand Down Expand Up @@ -119,9 +117,6 @@ sub translation {
"ARE_AUTHORITATIVE" => "All these nameservers are confirmed to be authoritative : {nsset}.",
"NS_RR_NO_CNAME" => "No nameserver point to CNAME alias.",
"SOA_EXISTS" => "All the nameservers have SOA record.",
"ENOUGH_NS_TOTAL" => "Parent and child list enough ({count}) nameservers ({ns}). Lower limit set to {minimum}.",
"NOT_ENOUGH_NS_TOTAL" =>
"Parent and child do not list enough ({count}) nameservers ({ns}). Lower limit set to {minimum}.",
'IPV4_DISABLED' => 'IPv4 is disabled, not sending "{rrtype}" query to {ns}/{address}.',
'IPV6_DISABLED' => 'IPv6 is disabled, not sending "{rrtype}" query to {ns}/{address}.',
};
Expand Down Expand Up @@ -185,30 +180,6 @@ sub delegation01 {
);
}

my @all_nsnames = uniq map { $_->string } @{ Zonemaster::Engine::TestMethods->method2( $zone ) },
@{ Zonemaster::Engine::TestMethods->method3( $zone ) };

if ( scalar( @all_nsnames ) >= $MINIMUM_NUMBER_OF_NAMESERVERS ) {
push @results,
info(
ENOUGH_NS_TOTAL => {
count => scalar( @all_nsnames ),
minimum => $MINIMUM_NUMBER_OF_NAMESERVERS,
ns => join( q{;}, sort @all_nsnames ),
}
);
}
else {
push @results,
info(
NOT_ENOUGH_NS_TOTAL => {
count => scalar( @all_nsnames ),
minimum => $MINIMUM_NUMBER_OF_NAMESERVERS,
ns => join( q{;}, sort @all_nsnames ),
}
);
}

return @results;
} ## end sub delegation01

Expand Down
8 changes: 0 additions & 8 deletions share/en.po
View file
Open in desktop
Expand Up @@ -281,10 +281,6 @@ msgstr "Child lists enough ({count}) nameservers ({ns}). Lower limit set to {min
msgid "Parent lists enough ({count}) nameservers ({glue}). Lower limit set to {minimum}."
msgstr "Parent lists enough ({count}) nameservers ({glue}). Lower limit set to {minimum}."

#: DELEGATION:ENOUGH_NS_TOTAL
msgid "Parent and child list enough ({count}) nameservers ({ns}). Lower limit set to {minimum}."
msgstr "Parent and child list enough ({count}) nameservers ({ns}). Lower limit set to {minimum}."

#: DELEGATION:EXTRA_NAME_CHILD
msgid "Child has nameserver(s) not listed at parent ({extra})."
msgstr "Child has nameserver(s) not listed at parent ({extra})."
Expand Down Expand Up @@ -313,10 +309,6 @@ msgstr "Child does not list enough ({count}) nameservers ({ns}). Lower limit set
msgid "Parent does not list enough ({count}) nameservers ({glue}). Lower limit set to {minimum}."
msgstr "Parent does not list enough ({count}) nameservers ({glue}). Lower limit set to {minimum}."

#: DELEGATION:NOT_ENOUGH_NS_TOTAL
msgid "Parent and child do not list enough ({count}) nameservers ({ns}). Lower limit set to {minimum}."
msgstr "Parent and child do not list enough ({count}) nameservers ({ns}). Lower limit set to {minimum}."

#: DELEGATION:NS_RR_IS_CNAME
msgid "Nameserver {ns} {address_type} RR point to CNAME."
msgstr "Nameserver {ns} {address_type} RR point to CNAME."
Expand Down
8 changes: 0 additions & 8 deletions share/fr.po
View file
Open in desktop
Expand Up @@ -281,10 +281,6 @@ msgstr "Les serveurs de noms de la zone retournent suffisamment de serveurs ({co
msgid "Parent lists enough ({count}) nameservers ({glue}). Lower limit set to {minimum}."
msgstr "Les serveurs de noms de la zone parente retournent suffisamment de serveurs ({count}) faisant autorité ({glue}). La limite inférieure étant fixée à {minimum}."

#: DELEGATION:ENOUGH_NS_TOTAL
msgid "Parent and child list enough ({count}) nameservers ({ns}). Lower limit set to {minimum}."
msgstr "Les serveurs de noms de la zone parente et les serveurs de noms de la zone retournent suffisamment de serveurs ({count}) faisant autorité ({ns}). La limite inférieure étant fixée à {minimum}."

#: DELEGATION:EXTRA_NAME_CHILD
msgid "Child has nameserver(s) not listed at parent ({extra})."
msgstr "Les serveurs de noms de la zone retournent des serveurs faisant autorité ({extra}) qui ne le sont pas par les serveurs de noms de la zone parente."
Expand Down Expand Up @@ -314,10 +310,6 @@ msgstr "Les serveurs de noms de la zone ne retournent pas assez de serveurs ({co
msgid "Parent does not list enough ({count}) nameservers ({glue}). Lower limit set to {minimum}."
msgstr "Les serveurs de noms de la zone parente ne retournent pas assez de serveurs ({count}) faisant autorité ({glue}). La limite inférieure étant fixée à {minimum}."

#: DELEGATION:NOT_ENOUGH_NS_TOTAL
msgid "Parent and child do not list enough ({count}) nameservers ({ns}). Lower limit set to {minimum}."
msgstr "Les serveurs de noms de la zone parente et les serveurs de noms de la zone ne retournent pas suffisamment de serveurs ({count}) faisant autorité ({{ns}). La limite inférieure étant fixée à {minimum}."

#: DELEGATION:NS_RR_IS_CNAME
msgid "Nameserver {ns} {address_type} RR point to CNAME."
msgstr "L'enregistrement de type \"{address_type}\" retourné par le serveur de noms {ns} est un alias (CNAME)."
Expand Down
6 changes: 2 additions & 4 deletions share/iana-profile.json
View file
Open in desktop
Expand Up @@ -34,16 +34,14 @@
"DISTINCT_IP_ADDRESS" : "INFO",
"ENOUGH_NS" : "INFO",
"ENOUGH_NS_GLUE" : "INFO",
"ENOUGH_NS_TOTAL" : "INFO",
"EXTRA_NAME_CHILD" : "NOTICE",
"EXTRA_NAME_PARENT" : "ERROR",
"IPV4_DISABLED" : "DEBUG",
"IPV6_DISABLED" : "DEBUG",
"IS_NOT_AUTHORITATIVE" : "WARNING",
"NAMES_MATCH" : "INFO",
"NOT_ENOUGH_NS" : "INFO",
"NOT_ENOUGH_NS_GLUE" : "INFO",
"NOT_ENOUGH_NS_TOTAL" : "ERROR",
"NOT_ENOUGH_NS" : "ERROR",
"NOT_ENOUGH_NS_GLUE" : "ERROR",
"NS_RR_IS_CNAME" : "WARNING",
"NS_RR_NO_CNAME" : "INFO",
"REFERRAL_SIZE_LARGE" : "WARNING",
Expand Down
6 changes: 2 additions & 4 deletions share/policy.json
View file
Open in desktop
Expand Up @@ -73,16 +73,14 @@
"DISTINCT_IP_ADDRESS" : "INFO",
"ENOUGH_NS" : "INFO",
"ENOUGH_NS_GLUE" : "INFO",
"ENOUGH_NS_TOTAL" : "INFO",
"EXTRA_NAME_CHILD" : "NOTICE",
"EXTRA_NAME_PARENT" : "ERROR",
"IPV4_DISABLED" : "DEBUG",
"IPV6_DISABLED" : "DEBUG",
"IS_NOT_AUTHORITATIVE" : "WARNING",
"NAMES_MATCH" : "INFO",
"NOT_ENOUGH_NS" : "INFO",
"NOT_ENOUGH_NS_GLUE" : "INFO",
"NOT_ENOUGH_NS_TOTAL" : "ERROR",
"NOT_ENOUGH_NS" : "ERROR",
"NOT_ENOUGH_NS_GLUE" : "ERROR",
"NS_RR_IS_CNAME" : "WARNING",
"NS_RR_NO_CNAME" : "INFO",
"REFERRAL_SIZE_LARGE" : "WARNING",
Expand Down
8 changes: 0 additions & 8 deletions share/sv.po
View file
Open in desktop
Expand Up @@ -281,10 +281,6 @@ msgstr "Dotterzonen har tillräckligt många ({count}) namnservrar ({ns}). Minst
msgid "Parent lists enough ({count}) nameservers ({glue}). Lower limit set to {minimum}."
msgstr "Delegeringen i moderzonen har tillräckligt många ({count}) namnservrar ({glue}). Minsta tillåtna antalet är {minimum}."

#: DELEGATION:ENOUGH_NS_TOTAL
msgid "Parent and child list enough ({count}) nameservers ({ns}). Lower limit set to {minimum}."
msgstr "Moderzonen och dotterzonen har tillräckligt många ({count}) namnservrar ({ns}). Minsta tillåtna antalet är {minimum}."

#: DELEGATION:EXTRA_NAME_CHILD
msgid "Child has nameserver(s) not listed at parent ({extra})."
msgstr "Dotterzonen har en eller flera namnservrar som inte finns i delegeringen i moderzonen ({extra})."
Expand All @@ -311,10 +307,6 @@ msgstr "Det finns inte tillräckligt många namnservrar (NS-poster) i dotterzone
msgid "Parent does not list enough ({count}) nameservers ({glue}). Lower limit set to {minimum}."
msgstr "Det finns inte tillräckligt många ({count}) namnservrar (NS-poster) i delegeringen (moderzonen). Minsta tillåtna antal är {minimum}."

#: DELEGATION:NOT_ENOUGH_NS_TOTAL
msgid "Parent and child do not list enough ({count}) nameservers ({ns}). Lower limit set to {minimum}."
msgstr "Delegeringen (moderzonen) och dotterzonen har inte tillräckligt många ({count}) namnservrar ({ns}). Minsta tillåtna antal är {minimum}."

#: DELEGATION:NS_RR_IS_CNAME
msgid "Nameserver {ns} {address_type} RR point to CNAME."
msgstr "Namnservern '{ns}' har en CNAME-post."
Expand Down
2 changes: 0 additions & 2 deletions t/Test-delegation.t
View file
Open in desktop
Expand Up @@ -22,7 +22,6 @@ my $iis = Zonemaster::Engine->zone( q{iis.se} );
%res = map { $_->tag => $_ } Zonemaster::Engine::Test::Delegation->all( $iis );
ok( $res{ENOUGH_NS}, q{ENOUGH_NS} );
ok( $res{ENOUGH_NS_GLUE}, q{ENOUGH_NS_GLUE} );
ok( $res{ENOUGH_NS_TOTAL}, q{ENOUGH_NS_TOTAL} );
ok( $res{NAMES_MATCH}, q{NAMES_MATCH} );
ok( $res{REFERRAL_SIZE_OK}, q{REFERRAL_SIZE_OK} );

Expand All @@ -37,7 +36,6 @@ ok( $res{SOA_EXISTS}, q{SOA_EXISTS} );
ok( $res{ARE_AUTHORITATIVE}, q{ARE_AUTHORITATIVE} );

%res = map { $_->tag => 1 } Zonemaster::Engine->test_module( q{delegation}, q{delegation02.zut-root.rd.nic.fr} );
ok( $res{NOT_ENOUGH_NS_TOTAL}, q{NOT_ENOUGH_NS_TOTAL} );
ok( $res{NOT_ENOUGH_NS}, q{NOT_ENOUGH_NS} );
ok( $res{NOT_ENOUGH_NS_GLUE}, q{NOT_ENOUGH_NS_GLUE} );

Expand Down