Changeset 675 for trunk/cgi-bin/main.cgi

Timestamp:

01/15/15 17:52:26 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Extend per-IP rDNS through the "confirm add" page and the "edit" page. See #1.

• Add flag in getBlockRDNS return to indicate if the results are from local caching instead of RPC results. There isn't really a clear way to globally flag "RPC server is up".
• Add a sub to retrieve per-IP reverse DNS information for a passed CIDR range. Not limited in IPDB.pm, but dnsadmin will refuse to return anything for a block larger than /24 (v4) or /120 (v6) - an 8 bit inverse mask.
• Use the new sub on editing a small(ish) non-pool block. CSS magic notwithstanding, handling more than 32 IPs in a list like this is awkward.

File:

• trunk/cgi-bin/main.cgi (modified) (2 diffs)

trunk/cgi-bin/main.cgi

@@ -313 +313 @@
     my $block = new NetAddr::IP $webvar{block};
 
-    my $rdns = getBlockRDNS($ip_dbh, id => $webvar{parent}, type => $webvar{fbtype}, user => $authuser);
+    my ($rdns,$cached) = getBlockRDNS($ip_dbh, id => $webvar{parent}, type => $webvar{fbtype}, user => $authuser);
     $page->param(rdns => $rdns) if $rdns;
     $page->param(parent => $webvar{parent});
     $page->param(fbid => $webvar{fbid});
+    # visual flag that we're working IPDB-local, not off more authoritative data in dnsadmin
+    $page->param(cached => $cached);
 
     $webvar{fbtype} = '' if !$webvar{fbtype};
@@ -687 +689 @@
   $blockinfo->{type} =~ s/\s//;
 
+  my $cached;
   # Get rDNS info;  duplicates a bit of getBlockData but also does the RPC call if possible
-  $blockinfo->{rdns} = getBlockRDNS($ip_dbh, id => $webvar{id}, type => $blockinfo->{type}, user => $authuser);
+  ($blockinfo->{rdns},$cached) = getBlockRDNS($ip_dbh, id => $webvar{id}, type => $blockinfo->{type}, user => $authuser);
+  # visual flag that we're working IPDB-local, not off more authoritative data in dnsadmin
+  $page->param(cached => $cached);
+
+  my $cidr = new NetAddr::IP $blockinfo->{block};
+  # Limit the per-IP rDNS list based on CIDR length;  larger ones just take up too much space.
+  # Also, don't show on IP pools;  the individual IPs will have a space for rDNS
+  # Don't show on single IPs;  these use the "pattern" field
+  if ($IPDBacl{$authuser} =~ /c/
+      && $cidr->masklen != $cidr->bits
+      && ($cidr->bits - $cidr->masklen) <= $IPDB::maxrevlist
+      && $webvar{alloctype} !~ /^.[dpi]/
+      # do we want to allow v6 at all?
+      #&& ! $cidr->{isv6}
+      ) {
+    $page->param(r_iplist => getRDNSbyIP($ip_dbh, id => $webvar{id}, type => $blockinfo->{type},
+        range => $blockinfo->{block}, user => $authuser) );
+  }
 
   $page->param(block    => $blockinfo->{block});