Changeset 31 for trunk/dns.cgi

Timestamp:

11/09/09 18:02:24 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweak labels and logic on DNS query page
Remove extraneous template
Remove legacy content in axfr.tmpl, replace with live content
Stub out AXFR import

File:

• trunk/dns.cgi (modified) (5 diffs)

trunk/dns.cgi

@@ -530 +530 @@
 
   $page->param(qfor => $webvar{qfor}) if $webvar{qfor};
-  fill_rectypes($webvar{type} ? $webvar{type} : '');
-  $page->param(trace => $webvar{trace}) if $webvar{trace};
+  fill_rectypes($webvar{type} ? $webvar{type} : '', 1);
+  $page->param(nrecurse => $webvar{nrecurse}) if $webvar{nrecurse};
   $page->param(resolver => $webvar{resolver}) if $webvar{resolver};
 
   if ($webvar{qfor}) {
     my $resolv = Net::DNS::Resolver->new;
+    $resolv->tcp_timeout(5);    # make me adjustable!
+    $resolv->udp_timeout(5);    # make me adjustable!
+    $resolv->recurse(0) if $webvar{nrecurse};
+    $resolv->nameservers($webvar{resolver}) if $webvar{resolver};
     my $query = $resolv->query($webvar{qfor}, $typemap{$webvar{type}});
     if ($query) {
@@ -546 +550 @@
         my %row;
         my ($host,$ttl,$class,$type,$data) =
-                ($rr->string =~ /^([0-9a-zA-Z_.-]+)\s+(\d+)\s+([A-Za-z]+)\s+([A-Za-z]+)\s+(.+)$/);
+                ($rr->string =~ /^([0-9a-zA-Z_.-]+)\s+(\d+)\s+([A-Za-z]+)\s+([A-Za-z]+)\s+(.+)$/s);
         $row{host} = $host;
         $row{ftype} = $type;
-        $row{rdata} = $data;
+        $row{rdata} = ($type eq 'SOA' ? "<pre>$data</pre>" : $data);
         push @answer, \%row;
       }
@@ -589 +593 @@
   ## done DNS query
 
+} elsif ($webvar{page} eq 'axfr') {
+
+  # don't need this while we've got the dropdown in the menu.  hmm.
+  #fill_grouplist;
+
+  $page->param(ifrom => $webvar{ifrom}) if $webvar{ifrom};
+  $page->param(rwsoa => $webvar{rwsoa}) if $webvar{rwsoa};
+  $page->param(rwns => $webvar{rwns}) if $webvar{rwns};
+  $page->param(importdoms => $webvar{importdoms}) if $webvar{importdoms};
+##work
+  push @debugbits, "<pre>$webvar{importdoms}</pre>";
 }
 
@@ -756 +771 @@
 sub fill_rectypes {
   my $type = shift || $reverse_typemap{A};
+  my $soaflag = shift || 0;
 
   my $sth = $dbh->prepare("SELECT val,name FROM rectypes WHERE stdflag=1 ORDER BY listorder");
@@ -765 +781 @@
     push @typelist, \%row;
   }
+  if ($soaflag) {
+    my %row = ( recval => $reverse_typemap{SOA}, recname => 'SOA' );
+    $row{tselect} = 1 if $reverse_typemap{SOA} == $type;
+    push @typelist, \%row;
+  }
   $page->param(typelist => \@typelist);
-}
+} # fill_rectypes
 
 sub fill_recdata {