Changeset 675 for trunk/cgi-bin

Timestamp:

01/15/15 17:52:26 (10 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.

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (4 diffs)
• main.cgi (modified) (2 diffs)

trunk/cgi-bin/IPDB.pm

@@ -32 +32 @@
         &getMasterList &getTypeList &getPoolSelect &findAllocateFrom
         &ipParent &subParent &blockParent &getRoutedCity
-        &allocateBlock &updateBlock &deleteBlock &getBlockData &getBlockRDNS
+        &allocateBlock &updateBlock &deleteBlock &getBlockData &getBlockRDNS &getRDNSbyIP
         &getNodeList &getNodeName &getNodeInfo
         &mailNotify
@@ -47 +47 @@
                 &getMasterList &getTypeList &getPoolSelect &findAllocateFrom
                 &ipParent &subParent &blockParent &getRoutedCity
-                &allocateBlock &updateBlock &deleteBlock &getBlockData &getBlockRDNS
+                &allocateBlock &updateBlock &deleteBlock &getBlockData &getBlockRDNS &getRDNSbyIP
                 &getNodeList &getNodeName &getNodeInfo
                 &mailNotify
@@ -1680 +1680 @@
 
   $args{type} = 'b' if !$args{type};
+  my $cached = 1;
 
   # snag entry from database
@@ -1721 +1722 @@
     my $remote_rdns = _rpc('getRevPattern', %rpcargs);
     $rdns = $remote_rdns if $remote_rdns;
+    $cached = 0;
   }
 
   # hmm.  do we care about where it actually came from?
-  return $rdns;
+  return $rdns, $cached;
 } # end getBlockRDNS()
+
+
+## IPDB::getRDNSbyIP()
+# Get individual reverse entries for the IP or CIDR IP range passed.  Sort of looking the
+# opposite direction down the netblock tree compared to getBlockRDNS() above.
+sub getRDNSbyIP {
+  my $dbh = shift;
+  my %args = @_;  # We want to accept a variety of call types
+
+  # key arguments:  allocation ID, type
+  unless ($args{id} || $args{type}) {
+    $errstr = 'Missing allocation ID or type';
+    return;
+  }
+
+  my @ret = ();
+  # special case:  single IP.  Check if it's an allocation or in a pool, then do the RPC call for fresh data.
+  if ($args{type} =~ /^.i$/) {
+    my ($ip, $localrev) = $dbh->selectrow_array("SELECT ip, rdns FROM poolips WHERE id = ?", undef, ($args{id}) );
+    push @ret, { 'r_ip' => $ip, 'iphost' => $localrev };
+  } else {
+    if ($rpc_url) {
+      my %rpcargs = (
+        rpcuser => $args{user},
+        group => $revgroup,     # not sure how this could sanely be exposed, tbh...
+        cidr => $args{range},
+        );
+
+      my $remote_rdns = _rpc('getRevSet', %rpcargs);
+      return $remote_rdns;
+#      $rdns = $remote_rdns if $remote_rdns;
+#      $cached = 0;
+    }
+  }
+  return \@ret;
+} # end getRDNSbyIP()
 
 

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});