Changeset 608

Timestamp:

04/04/14 16:32:11 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

To override the note in r607; NetAddr::IP will resolve hostnames or domain
names by way of gethostbyname() and use the resulting IP to create the
object. In most cases this shouldn't be an issue but some code segments
will now need an additional regex check before feeding things to NetAddr::IP
to ensure strange local DNS data doesn't cause user input to get mangled.

Fix code comment from r607; the bug is arguably in my use of NetAddr::IP
to answer "Is this an IP address?".

Remove NetAddr:IP call from a segment in dns.cgi; a simple regex check on
the zone CIDR retrieved from the database should be enough to answer "Is
this an IPv6 zone?".

Location:

trunk

Files:

• DNSDB.pm (modified) (1 diff)
• dns.cgi (modified) (1 diff)

trunk/DNSDB.pm

@@ -3749 +3749 @@
         ($self->{showrev_arpa} eq 'record' || $self->{showrev_arpa} eq 'all') &&
         $rec->{val} !~ /\.arpa$/ ) {
-      # note we're sneakily skipping all reverse zone .arpa "hostnames" on the excuse
-      # that this fragment won't do anything anyway.  however:
-      # knurd.5.0.0.0.b.0.0.b.5.b.0.b.f.e.e.b.d.a.e.d.ip6.arpa -> 192.168.7.6/32
-      # when fed to NetAddr::IP.  O_o  (At least 4.058, .062, and .071, on CentOS 5 and Debian wheezy and sid)
+      # skip all reverse zone .arpa "hostnames" since they're already .arpa names.
 ##enhance:  extend {showrev_arpa} eq 'record' to specify record types
       my $tmpip = new NetAddr::IP $rec->{val};

trunk/dns.cgi

@@ -2069 +2069 @@
     $page->param(name   => ($webvar{name} ? $webvar{name} : $domroot));
     my $zname = ($webvar{defrec} eq 'y' ? 'ZONE' : $dnsdb->revName($webvar{parentid}, 'y'));
-    my $cidr = new NetAddr::IP $zname;
     $zname =~ s|\d*/\d+$||;
     $page->param(address        => ($webvar{address} ? $webvar{address} : $zname));
     $page->param(typelist => $dnsdb->getTypelist($webvar{revrec},
-        $webvar{type} || ($cidr->{isv6} ? $reverse_typemap{'AAAA+PTR'} : $reverse_typemap{'A+PTR'})));
+        $webvar{type} || ($zname =~ /:/ ? $reverse_typemap{'AAAA+PTR'} : $reverse_typemap{'A+PTR'})));
   }
 # retrieve the right ttl instead of falling (way) back to the hardcoded system default