Changeset 674 for trunk/cgi-bin

Timestamp:

01/14/15 12:58:58 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Start extending rDNS support to allow entering per-IP reverse names. See #1.

• configuration for maximum IP list length
• CSS to support hideable space so longer lists don't distort and confuse the page too much
• Hideable space on the assignment confirmation page for per-IP fields
• Generate IP list for assignment confirmation - note we can't do it on the previous page without heavy AJAX (or heavier Javascript) because we don't know what block we're even assigning at that stage.

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (1 diff)
• MyIPDB.pm (modified) (1 diff)
• main.cgi (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -99 +99 @@
 our $revgroup = 1;      # should probably be configurable somewhere
 our $rpccount = 0;
+
+# Largest inverse CIDR mask length to show per-IP rDNS list
+# (eg, NetAddr::IP->bits - NetAddr::IP->masklen)
+our $maxrevlist = 5;  # /27
 
 ##

trunk/cgi-bin/MyIPDB.pm

@@ -72 +72 @@
 #$IPDB::rpc_url = 'http://dnsadmin.example.com/dns-rpc.cgi';
 
+# Largest inverse CIDR mask length to show per-IP rDNS list
+# (eg, NetAddr::IP->bits - NetAddr::IP->masklen)
+# allowing longer than a /27 is probably going to slow things down;  longer than /29 will scroll.
+#$IPDB::maxrevlist = 8;  # v4 /24
+
 ## connectDB_My()
 # Wrapper for IPDB::connectDB

trunk/cgi-bin/main.cgi

@@ -462 +462 @@
     } # check for freeblocks assignment or IPDB-controlled assignment
 
+    # Generate the IP list for the new allocation in case someone wants to set per-IP rDNS right away.
+    # We don't do this on the previous page because we don't know how big a block or even what IP range
+    # it's for (if following the "normal" allocation process)
+    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}
+        ) {
+      my @list;
+      foreach my $ip (@{$cidr->splitref()}) {
+        my %row;
+        $row{r_ip} = $ip->addr;
+        $row{iphost} = '';
+        push @list, \%row;
+      }
+      $page->param(r_iplist => \@list);
+      # We don't use this here, because these IPs should already be bare.
+      # ... or should we be paranoid?  Make it a config option?
+      #getRDNSbyIP($ip_dbh, type => $webvar{alloctype}, range => "$cidr", user => $authuser) );
+    }
   } # if ($webvar{alloctype} =~ /^.i$/)