Merge pull request zonemaster#1267 from zonemaster/master

Merge master into develop (Engine)

Changes

@@ -1,5 +1,13 @@
 Release history for Zonemaster component Zonemaster-Engine
 
+v4.7.1 2023-07-24 (public fix version)
+
+ [Fixes]
+ - Fixes typo in the B01_CHILD_IS_ALIAS msgid for test case BASIC01
+   (#1240, #1262)
+ - Updates the translation to Norwegian (#1246)
+ - Fixes bug in test case BASIC01 (#1249)
+
 
 v4.7.0 2023-06-21 (public release version)
 

MANIFEST

@@ -147,6 +147,10 @@ t/Test-address.data
 t/Test-address.t
 t/Test-basic.data
 t/Test-basic.t
+t/Test-basic02-A.data
+t/Test-basic02-A.t
+t/Test-basic02-B.data
+t/Test-basic02-B.t
 t/Test-connectivity.data
 t/Test-connectivity.t
 t/Test-connectivity03.data

lib/Zonemaster/Engine.pm

@@ -1,6 +1,6 @@
 package Zonemaster::Engine;
 
-use version; our $VERSION = version->declare("v4.7.0");
+use version; our $VERSION = version->declare("v4.7.1");
 
 use 5.014002;
 

lib/Zonemaster/Engine/Test.pm

@@ -83,7 +83,7 @@ sub run_all_for {
     push @results, Zonemaster::Engine::Test::Basic->all( $zone );
     info( MODULE_END => { module => 'Zonemaster::Engine::Test::Basic' } );
 
-    if ( Zonemaster::Engine::Test::Basic->can_continue( @results ) and Zonemaster::Engine->can_continue() ) {
+    if ( Zonemaster::Engine::Test::Basic->can_continue( $zone, @results ) and Zonemaster::Engine->can_continue() ) {
         foreach my $mod ( __PACKAGE__->modules ) {
 
             my $module = "Zonemaster::Engine::Test::$mod";

lib/Zonemaster/Engine/Test/Basic.pm

@@ -40,7 +40,9 @@ sub all {
     {
         push @results, $class->basic01( $zone );
 
-        push @results, $class->basic02( $zone );
+        if ( grep { $_->tag eq q{B01_CHILD_FOUND} } @results ) {
+           push @results, $class->basic02( $zone );
+        }
 
         # Perform BASIC3 if BASIC2 failed
         if ( none { $_->tag eq q{B02_AUTH_RESPONSE_SOA} } @results ) {
@@ -61,14 +63,15 @@ sub all {
 } ## end sub all
 
 sub can_continue {
-    my ( $class, @results ) = @_;
+    my ( $class, $zone, @results ) = @_;
     my %tag = map { $_->tag => 1 } @results;
+    my $is_undelegated = Zonemaster::Engine::Recursor->has_fake_addresses( $zone->name->string );
 
     if ( not $tag{B02_NO_DELEGATION} and $tag{B02_AUTH_RESPONSE_SOA} ) {
         return 1;
     }
     else {
-        return;
+        return $is_undelegated;
     }
 }
 
@@ -162,7 +165,7 @@ Readonly my %TAG_DESCRIPTIONS => (
     B01_CHILD_IS_ALIAS => sub {
         __x    # BASIC:B01_CHILD_IS_ALIAS
           '"{domain_child}" is not a zone. It is an alias for "{domain_target}". Run a test for "{domain_target}" instead. '
-          . 'Returned from name servers "{ns_ip_list}.', @_;
+          . 'Returned from name servers "{ns_ip_list}".', @_;
     },
     B01_CHILD_FOUND => sub {
         __x    # BASIC:B01_CHILD_FOUND
@@ -450,11 +453,11 @@ sub basic01 {
         }
 
         if ( $p->is_redirect and index( $zone_name, name( lc( ( $p->get_records( 'NS' ) )[0]->owner ) ) ) == -1 
-            and index( $zone->name->fqdn, name( lc( ( $p->get_records( 'NS' ) )[0]->owner ) ) ) == -1 ) {
+            and index( $zone->name, name( lc( ( $p->get_records( 'NS' ) )[0]->owner ) ) ) == -1 ) {
             next;
         }
 
-        if ( $p->is_redirect and index( $zone->name->fqdn, name( lc( ( $p->get_records( 'NS' ) )[0]->owner ) ) ) > 0 ) {
+        if ( $p->is_redirect and index( $zone->name, name( lc( ( $p->get_records( 'NS' ) )[0]->owner ) ) ) > 0 ) {
             $rrs_ns{$_->nsdname}{'referral'} = $_->owner for $p->get_records( 'NS' );
             $rrs_ns{$_->owner}{'addresses'}{$_->address} = 1 for ( $p->get_records( q{A} ), $p->get_records( 'AAAA' ) );
 
@@ -475,7 +478,7 @@ sub basic01 {
 
                 foreach my $ns_ip ( keys %{ $rrs_ns{$ns_name}{'addresses'} } ) {
                     unless ( grep { $_ eq $ns_ip } @handled_servers ) {
-                        $all_servers{$ns_name . '/' . $ns_ip} = $rrs_ns{$ns_name}{'referral'};
+                        $all_servers{$ns_name . '/' . $ns_ip} = name( $rrs_ns{$ns_name}{'referral'} );
                         push @remaining_servers, $ns_name . '/' . $ns_ip;
                         push @handled_servers, $ns_ip;
                     }
@@ -584,8 +587,9 @@ sub basic01 {
 
                 if ( $p->aa and scalar $p->get_records_for_name( 'SOA', $zone->name->string, q{answer} ) ) {
                     if ( $zone->name->next_higher eq $zone_name ) {
-                        push @{ $aa_soa{$zone_name} }, $ns_string;
+                        push @{ $parent_found{$zone_name} }, $ns_string;
                     }
+                    push @{ $aa_soa{$zone_name} }, $ns_string;
                 }
 
                 if ( $p->aa and scalar $p->get_records_for_name( 'CNAME', $zone->name->string, q{answer} ) ) {

share/da.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-02 16:44+0000\n"
-"PO-Revision-Date: 2023-06-01 11:58+0200\n"
+"POT-Creation-Date: 2023-07-21 06:21+0000\n"
+"PO-Revision-Date: 2023-07-21 06:18+0000\n"
 "Last-Translator: Niels Haarbo <[email protected]>\n"
 "Language-Team: Zonemaster Team\n"
 "Language: da\n"
@@ -157,11 +157,11 @@ msgstr "Navneserverne svarede ikke på en A-forespørgsel."
 msgid ""
 "\"{domain_child}\" is not a zone. It is an alias for \"{domain_target}\". "
 "Run a test for \"{domain_target}\" instead. Returned from name servers "
-"\"{ns_ip_list}."
+"\"{ns_ip_list}\"."
 msgstr ""
 "\"{domain_child}\" er ikke en zone. Det er et alias for \"{domain_target}\". "
 "Afvikl en test for \"{domain_target}\" i stedet for. Returneret fra "
-"navneserverne \"{ns_ip_list}."
+"navneserverne \"{ns_ip_list}\"."
 
 #. BASIC:B01_CHILD_FOUND
 #, perl-brace-format

share/es.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-25 14:42+0000\n"
-"PO-Revision-Date: 2023-05-24 11:37-0400\n"
+"POT-Creation-Date: 2023-07-21 06:17+0000\n"
+"PO-Revision-Date: 2023-07-21 06:25+0000\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: Zonemaster Team\n"
 "Language: es\n"
@@ -170,7 +170,7 @@ msgstr "Los servidores de nombres no respondieron a consultas A."
 msgid ""
 "\"{domain_child}\" is not a zone. It is an alias for \"{domain_target}\". "
 "Run a test for \"{domain_target}\" instead. Returned from name servers "
-"\"{ns_ip_list}."
+"\"{ns_ip_list}\"."
 msgstr ""
 "\"{domain_child}\" no es una zona. Es un alias de \"{domain_target}\". Por "
 "esto, realice las pruebas en \"{domain_target}\". Obtenido de los servidores "

share/fi.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-20 11:38+0000\n"
-"PO-Revision-Date: 2023-06-20 12:34+0300\n"
+"POT-Creation-Date: 2023-07-21 06:17+0000\n"
+"PO-Revision-Date: 2023-07-21 06:25+0000\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: Traficom domain team\n"
 "Language: fi\n"
@@ -165,7 +165,7 @@ msgstr "Nimipalvelimet eivät vastanneet A-tietue kyselyyn."
 msgid ""
 "\"{domain_child}\" is not a zone. It is an alias for \"{domain_target}\". "
 "Run a test for \"{domain_target}\" instead. Returned from name servers "
-"\"{ns_ip_list}."
+"\"{ns_ip_list}\"."
 msgstr ""
 "\"{domain_child}\" ei ole vyöhyke. Se on alias verkkotunnukselle "
 "\"{domain_target}\". Suorita sen sijaan testi verkkotunnukselle "

share/fr.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-19 08:00+0200\n"
-"PO-Revision-Date: 2023-06-19 08:14+0200\n"
+"POT-Creation-Date: 2023-07-21 06:17+0000\n"
+"PO-Revision-Date: 2023-07-21 06:24+0000\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: Zonemaster Team\n"
 "Language: fr\n"
@@ -166,7 +166,7 @@ msgstr "Aucune réponse des serveurs de noms sur une requête de type \"A\"."
 msgid ""
 "\"{domain_child}\" is not a zone. It is an alias for \"{domain_target}\". "
 "Run a test for \"{domain_target}\" instead. Returned from name servers "
-"\"{ns_ip_list}."
+"\"{ns_ip_list}\"."
 msgstr ""
 "\"{domain_child}\" n’est pas une zone. C’est un alias pour "
 "\"{domain_target}\". Lancez plutôt un test de \"{domain_target}\". Données "