Merge pull request #1462 from zonemaster/develop

Merge develop branch into master (Engine)

Author: matsduf

.gitattributes

@@ -0,0 +1,2 @@
+# While technically text, diffs are meaningless on test data files.
+t/*.data -diff

.github/workflows/ci.yml

@@ -20,8 +20,8 @@ jobs:
           - develop
           #- latest
         perl:
-          - '5.38'
-          - '5.34'
+          - '5.40'
+          - '5.36'
           - '5.26'
         runner:
           - ubuntu-22.04

Changes

@@ -1,5 +1,27 @@
 Release history for Zonemaster component Zonemaster-Engine
 
+v8.0.0 2025-06-26 (part of Zonemaster v2025.1 release)
+
+ [Breaking changes]
+- Changes the string representation of IPv6 addresses in "NS_CREATED"
+  messages #1420
+- Separates functions to trim whitespace and to normalize domain
+  name, respectively #1316
+
+ [Features]
+- Updates local copies of IANA special IP registries #1456
+- Lowers all WARNING to NOTICE for test case Zone01 #1455
+- Downgrades ERROR to WARNING in test case DNSSEC03 #1452
+- Improves performance by optimizing critical code sections #1420
+
+ [Fixes]
+- Updates translations (Danish, Norwegian) #1418, #1449
+- Updates Dockerfile for release 2025.1 #1460
+- Fixes test case DNSSEC10 for name servers sharing the same IPs #1457
+- Adds blacklisting log message #1434
+- Fixes alias (CNAME) handling in Address03 test case #1432
+
+
 v7.1.0 2025-03-04 (part of Zonemaster v2024.2.1 release)
 
  [Release information]

Dockerfile

@@ -11,24 +11,31 @@ RUN apk add --no-cache \
     perl-module-build-tiny \
     # Compile-time dependencies
     perl-app-cpanminus \
+    perl-class-accessor \
     perl-clone \
     perl-file-sharedir \
     perl-file-slurp \
     perl-io-socket-inet6 \
     perl-list-moreutils \
     perl-locale-msgfmt \
+    perl-log-any \
     perl-lwp-protocol-https \
     perl-mail-spf \
     perl-module-install \
     perl-pod-coverage \
+    perl-readonly \
     perl-sub-override \
     perl-test-differences \
     perl-test-exception \
     perl-test-fatal \
+    perl-test-nowarnings \
     perl-test-pod \
     perl-text-csv \
+    perl-yaml \
+    perl-yaml-libyaml \
  && cpanm --no-wget --from=https://cpan.metacpan.org/ \
     Email::Valid \
+    List::Compare \
     Locale::PO \
     Locale::TextDomain \
     Module::Find \
@@ -51,15 +58,19 @@ RUN apk add --no-cache \
     # All the locales we need and more
     musl-locales \
     # Run-time dependencies
+    perl-class-accessor \
     perl-clone \
     perl-file-sharedir \
     perl-file-slurp \
     perl-io-socket-inet6 \
     perl-list-moreutils \
     perl-locale-msgfmt \
+    perl-log-any \
     perl-mail-spf \
     perl-mailtools \
     perl-module-install \
     perl-net-ip \
+    perl-readonly \
     perl-text-csv \
-    perl-try-tiny
+    perl-try-tiny \
+    perl-yaml-libyaml

MANIFEST

@@ -148,14 +148,14 @@ t/recursor-A.data
 t/recursor-A.t
 t/Test-address.data
 t/Test-address.t
+t/Test-address03.data
+t/Test-address03.t
 t/Test-basic.data
 t/Test-basic.t
 t/Test-basic01.data
 t/Test-basic01.t
-t/Test-basic02-A.data
-t/Test-basic02-A.t
-t/Test-basic02-B.data
-t/Test-basic02-B.t
+t/Test-basic02.data
+t/Test-basic02.t
 t/Test-connectivity.data
 t/Test-connectivity.t
 t/Test-connectivity03.data

MANIFEST.SKIP

@@ -71,6 +71,9 @@
 ^MYMETA\.
 #!end included /usr/share/perl/5.20/ExtUtils/MANIFEST.SKIP
 
+# More Git configuration files
+\B\.gitattributes\b
+
 # For GitHub action
 ^\.github/
 

Makefile.PL

@@ -34,7 +34,7 @@ requires 'Net::IP::XS'        => 0.21;
 requires 'Readonly'           => 0;
 requires 'Text::CSV'          => 0;
 requires 'YAML::XS'           => 0;
-requires 'Zonemaster::LDNS'   => 4.001000; # For v4.1.0
+requires 'Zonemaster::LDNS'   => 5.000000; # For v5.0.0
 
 test_requires 'Locale::PO'        => 0;
 test_requires 'Pod::Coverage'     => 0;

lib/Zonemaster/Engine.pm

@@ -3,7 +3,7 @@ package Zonemaster::Engine;
 use v5.16.0;
 use warnings;
 
-use version; our $VERSION = version->declare("v7.1.0");
+use version; our $VERSION = version->declare("v8.0.0");
 
 BEGIN {
     # Locale::TextDomain (<= 1.20) doesn't know about File::ShareDir so give a helping hand.
@@ -231,6 +231,7 @@ sub reset {
     Zonemaster::Engine::Nameserver->empty_cache();
     $logger->clear_history() if $logger;
     Zonemaster::Engine::Recursor->clear_cache();
+    Zonemaster::Engine::TestMethodsV2->clear_cache();
     return;
 }
 
@@ -408,7 +409,8 @@ Set the logger's start time to the current time.
 =item reset()
 
 Reset logger start time to current time, empty the list of log messages, clear
-nameserver object cache and recursor cache.
+nameserver object cache, clear recursor cache and clear all cached results of
+MethodsV2.
 
 =back
 

lib/Zonemaster/Engine/DNSName.pm

@@ -22,14 +22,20 @@ sub from_string {
     confess 'Argument must be a string: $domain'
       if !defined $domain || ref $domain ne '';
 
-    return $class->_new( { labels => [ split( /[.]/x, $domain ) ] } );
+    my $obj = Class::Accessor::new( $class, { labels => [ split( /[.]/x, $domain ) ] } );
+
+    # We have the raw string, so we can precompute the string representation
+    # easily and cheaply so it can be immediately returned by the string()
+    # method instead of recomputing it from the labels list. The only thing we
+    # need to do is to remove any trailing dot except if it’s the only
+    # character.
+    $obj->{_string} = ( $domain =~ s/.\K [.] \z//rx );
+
+    return $obj;
 }
 
 sub new {
-    my $proto = shift;
-    confess "must be called with a single argument"
-      if scalar( @_ ) != 1;
-    my $input = shift;
+    my ( $class, $input ) = @_;
 
     my $attrs = {};
     if ( !defined $input ) {
@@ -39,7 +45,7 @@ sub new {
         $attrs->{labels} = \@{ $input->labels };
     }
     elsif ( blessed $input && $input->isa( 'Zonemaster::Engine::Zone' ) ) {
-        $attrs->{labels} = [ split( /[.]/x, $input->name ) ];
+        $attrs->{labels} = \@{ $input->name->labels };
     }
     elsif ( ref $input eq '' ) {
         $attrs->{labels} = [ split( /[.]/x, $input ) ];
@@ -62,31 +68,20 @@ sub new {
         confess "Unrecognized argument: " . $what;
     }
 
-    # Type constraints
-    confess "Argument must be an ARRAYREF: labels"
-      if exists $attrs->{labels}
-      && ref $attrs->{labels} ne 'ARRAY';
-
-    my $class = ref $proto || $proto;
-    return $class->_new( $attrs );
-}
-
-sub _new {
-    my $class = shift;
-    my $attrs = shift;
-
-    my $obj = Class::Accessor::new( $class, $attrs );
-
-    return $obj;
+    return Class::Accessor::new( $class, $attrs );
 }
 
 sub string {
     my $self = shift;
 
-    my $name = join( '.', @{ $self->labels } );
-    $name = '.' if $name eq q{};
+    if ( not exists $self->{_string} ) {
+        my $string = join( '.', @{ $self->labels } );
+        $string = '.' if $string eq q{};
+
+        $self->{_string} = $string;
+    }
 
-    return $name;
+    return $self->{_string};
 }
 
 sub fqdn {
@@ -96,12 +91,21 @@ sub fqdn {
 }
 
 sub str_cmp {
-    my ( $self, $other ) = @_;
-    $other //= q{};    # Treat undefined value as root
+    # For performance reasons, we do not unpack @_.
+    # As a reminder, the calling convention is my ( $self, $other, $swap ) = @_.
 
-    $other =~ s/(.+)[.]\z/$1/x;
+    my $me = uc ( $_[0]->{_string} // $_[0]->string );
 
-    return ( uc( "$self" ) cmp uc( $other ) );
+    # Treat undefined value as root
+    my $other = $_[1] // q{};
+
+    if ( blessed $other and $other->isa( 'Zonemaster::Engine::DNSName' ) ) {
+        return $me cmp uc( $other->{_string} // $other->string() );
+    }
+    else {
+        # Assume $other is a string; remove trailing dot except if only character
+        return $me cmp uc( $other =~ s/.\K [.] \z//xr );
+    }
 }
 
 sub next_higher {
@@ -183,7 +187,7 @@ A reference to a list of strings, being the labels the DNS name is made up from.
 
 =over
 
-=item new($input) _or_ new({ labels => \@labellist})
+=item new($input) _or_ new({ labels => \@labellist })
 
 The constructor can be called with either a single argument or with a reference
 to a hash as in the example above.