Make ASNLookup.pm use standard recursive DNS lookup

zonemaster · Jul 18, 2023 · 253b4da · 253b4da
1 parent 76b9dd9
commit 253b4da
Show file tree

Hide file tree

Showing 6 changed files with 250 additions and 355 deletions.
diff --git a/lib/Zonemaster/Engine/ASNLookup.pm b/lib/Zonemaster/Engine/ASNLookup.pm
@@ -7,6 +7,7 @@ use warnings;
 use version; our $VERSION = version->declare( "v1.0.11" );
 
 use Zonemaster::Engine;
+use Zonemaster::Engine::Util qw( name );
 use Zonemaster::Engine::Nameserver;
 use Zonemaster::Engine::Profile;
 
@@ -37,7 +38,7 @@ sub get_with_prefix {
         else {
             $db_style = Zonemaster::Engine::Profile->effective->get( q{asn_db.style} );
             my %db_sources = %{ Zonemaster::Engine::Profile->effective->get( q{asn_db.sources} ) };
-            @db_sources = map { Zonemaster::Engine->zone( $_ ) } @{ $db_sources{ $db_style } };
+            @db_sources = map { name( $_ ) } @{ $db_sources{ $db_style } };
         }
     }
 
@@ -79,15 +80,15 @@ sub _cymru_asn_lookup {
     my $reverse = $ip->reverse_ip;
     my $db_source_nb = 0;
     foreach my $db_source ( @db_sources ) {
-        my $domain = $db_source->name->string;
+        my $domain = $db_source->string;
         my $pair   = {
             'in-addr.arpa.' => "origin.$domain",
             'ip6.arpa.'     => "origin6.$domain",
         };
         $db_source_nb++;
         foreach my $root ( keys %{$pair} ) {
             if ( $reverse =~ s/$root/$pair->{$root}/ix ) {
-                my $p = $db_source->query_persistent( $reverse, 'TXT' );
+                my $p = Zonemaster::Engine->recurse( $reverse, 'TXT' );
                 my @rr;
                 if ( $p ) {
                     @rr = $p->get_records( 'TXT' );
@@ -143,7 +144,7 @@ sub _ripe_asn_lookup {
     my $db_source_nb = 0;
     foreach my $db_source ( @db_sources ) {
         $db_source_nb++;
-        my $socket = IO::Socket::INET->new( PeerAddr => $db_source->name->string, 
+        my $socket = IO::Socket::INET->new( PeerAddr => $db_source->string,
                                             PeerPort => q{43}, 
                                             Proto => q{tcp} );
         unless ( $socket ) { 

diff --git a/t/Test-connectivity.data b/t/Test-connectivity.data
diff --git a/t/Test-connectivity03.data b/t/Test-connectivity03.data
diff --git a/t/Test-connectivity03.t b/t/Test-connectivity03.t
@@ -48,17 +48,17 @@ $profile_test = Zonemaster::Engine::Profile->from_json( $json );
 Zonemaster::Engine::Profile->effective->merge( $profile_test );
 
 ###
-my $zone = Zonemaster::Engine->zone( q{001.tf} );
+my $zone = Zonemaster::Engine->zone( q{zonemaster.net} );
 
-zone_gives( $testcase, $zone, [qw{IPV4_ONE_ASN IPV6_ONE_ASN}] );
-zone_gives_not( $testcase, $zone, [qw{EMPTY_ASN_SET ERROR_ASN_DATABASE IPV4_DIFFERENT_ASN IPV4_SAME_ASN IPV6_DIFFERENT_ASN IPV6_SAME_ASN}] );
+zone_gives( $testcase, $zone, [qw{IPV4_DIFFERENT_ASN IPV6_DIFFERENT_ASN}] );
+zone_gives_not( $testcase, $zone, [qw{EMPTY_ASN_SET ERROR_ASN_DATABASE IPV4_SAME_ASN IPV6_SAME_ASN IPV4_ONE_ASN IPV6_ONE_ASN}] );
 
 $zone = Zonemaster::Engine->zone( q{zut-root.rd.nic.fr} );
 zone_gives( $testcase, $zone, [qw{IPV4_ONE_ASN}] );
 zone_gives_not( $testcase, $zone, [qw{EMPTY_ASN_SET ERROR_ASN_DATABASE IPV4_DIFFERENT_ASN IPV4_SAME_ASN IPV6_DIFFERENT_ASN IPV6_ONE_ASN IPV6_SAME_ASN}] );
 
 TODO: {
-    my @missing = qw( EMPTY_ASN_SET ERROR_ASN_DATABASE IPV4_DIFFERENT_ASN IPV4_SAME_ASN IPV6_DIFFERENT_ASN IPV6_SAME_ASN );
+    my @missing = qw( EMPTY_ASN_SET ERROR_ASN_DATABASE IPV4_SAME_ASN IPV6_SAME_ASN IPV6_ONE_ASN);
     local $TODO = "Need to find/create zones with those errors: ";
     warn $TODO, "\n\t", join("\n\t", @missing), "\n";
 }