Changeset 1032 for branches/stable/dns.cgi

Timestamp:

02/10/26 13:30:58 (3 days ago)

Author:

Kris Deugau

Message:

/branches/stable

Start merging changes from /trunk forward based on changes actually applied
in production

Location:

branches/stable

Files:

• . (modified) (1 prop)
• dns.cgi (modified) (3 diffs)

branches/stable/dns.cgi

@@ -1734 +1734 @@
     my @results;
     foreach my $domain (@domlist) {
+##fixme: Net::DNS has made changes somewhere between 0.66something (~~ Debian wheezy) and
+# 0.81 (~~ Debian jessie) that cause taint failures when providing a hostname as a nameserver
+# for AXFR.  A proper fix may boil down to "split AXFR into its own script".  Feh.
+# For now, we'll just convert the requested AXFR host to an IP, and pass that down the chain instead.
+      my $nsip = gethostbyname($webvar{ifrom});
+      use Socket;
+      $nsip = inet_ntoa($nsip);
+      # strangely enough we don't seem to need to detaint:
+      #($nsip) = ($nsip =~ /^([a-fA-F0-9:.]+)$/);
       my %row;
-      my ($code,$msg) = $dnsdb->importAXFR($webvar{ifrom}, $domain, $webvar{group},
+      my ($code,$msg) = $dnsdb->importAXFR($nsip, $domain, $webvar{group},
         status => $webvar{domactive}, rwsoa => $webvar{rwsoa}, rwns => $webvar{rwns},
         newttl => ($webvar{forcettl} ? $webvar{newttl} : 0),
@@ -1968 +1977 @@
 # fill in general URL-to-self
   $page->param(script_self => "$ENV{SCRIPT_NAME}?");
+# fill in the generalized path-to-instance
+  $page->param(webpath => ($ENV{SCRIPT_NAME} =~ m|(/.+)/[^/]+$|)[0]);
 }
 
@@ -2153 +2164 @@
 
   foreach my $rec (@$foo2) {
-    $rec->{type} = $typemap{$rec->{type}};
+    if ($typemap{$rec->{type}}) {
+      $rec->{type} = $typemap{$rec->{type}};
+    } else {
+      $rec->{type} = "TYPE$rec->{type}";
+    }
     $rec->{fwdzone} = $rev eq 'n';
     $rec->{ttl} = '(auto)' if $rec->{ttl} == -1;