Merge pull request #1292 from zonemaster/master

Merge master into develop (Engine)
zonemaster · Sep 14, 2023 · 2c761db · 2c761db
2 parents c5cdf80 + 9b8888c
commit 2c761db
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,19 @@
 Release history for Zonemaster component Zonemaster-Engine
 
 
+v4.7.3 2023-09-08 (public fix version)
+
+ [Fixes]
+- Fixes a bug in test case BASIC01 that made tests of zones
+  fail if, while walking the chain of delegations from the root to the
+  zone under test, a name server returns a referral pointing to name
+  servers for an intermediate zone which are all out-of-bailiwick and
+  lacking glue. The bug was introduced in version v4.7.0 in release
+  v2023.1. (#1282)
+- Disable blacklisting for queries by NAMESERVER15 to prevent false
+  errors and warnings (#1285)
+
+
 v4.7.2 2023-08-07 (public fix version)
 
  [Fixes]

diff --git a/lib/Zonemaster/Engine.pm b/lib/Zonemaster/Engine.pm
@@ -1,6 +1,6 @@
 package Zonemaster::Engine;
 
-use version; our $VERSION = version->declare("v4.7.2");
+use version; our $VERSION = version->declare("v4.7.3");
 
 use 5.014002;
 

diff --git a/lib/Zonemaster/Engine/Test/Basic.pm b/lib/Zonemaster/Engine/Test/Basic.pm
@@ -473,13 +473,13 @@ sub basic01 {
                         my $p_a = Zonemaster::Engine::Recursor->recurse( $ns_name, q{A} );
 
                         if ( $p_a and $p_a->rcode eq 'NOERROR' ) {
-                            $rrs_ns{$ns_name}{'addresses'}{$_->address} = 1 for $p->get_records_for_name( 'A', $ns_name );
+                            $rrs_ns{$ns_name}{'addresses'}{$_->address} = 1 for $p_a->get_records_for_name( 'A', $ns_name );
                         }
 
                         my $p_aaaa = Zonemaster::Engine::Recursor->recurse( $ns_name, q{AAAA} );
 
                         if ( $p_aaaa and $p_aaaa->rcode eq 'NOERROR' ) {
-                            $rrs_ns{$ns_name}{'addresses'}{$_->address} = 1 for $p->get_records_for_name( 'AAAA', $ns_name );
+                            $rrs_ns{$ns_name}{'addresses'}{$_->address} = 1 for $p_aaaa->get_records_for_name( 'AAAA', $ns_name );
                         }
                     }
 

diff --git a/lib/Zonemaster/Engine/Test/Nameserver.pm b/lib/Zonemaster/Engine/Test/Nameserver.pm
@@ -1375,7 +1375,7 @@ sub nameserver15 {
         my $found_string = 0;
 
         foreach my $query_name ( q{version.bind}, q{version.server} ) {
-            my $p = $ns->query( $query_name, q{TXT}, { class => q{CH} } );
+            my $p = $ns->query( $query_name, q{TXT}, { class => q{CH}, blacklisting_disabled => 1 } );
 
             if ( $p and $p->rcode eq q{NOERROR} and scalar $p->get_records_for_name( q{TXT}, $query_name, q{answer} ) ) {
                 foreach my $rr ( $p->get_records_for_name(q{TXT}, $query_name, q{answer} ) ) {