Changeset 591 for trunk

Timestamp:

01/25/13 16:16:04 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

File off rough edges doing DNS updates for deleting allocations. See #1.

• pass back and handle more subtle variations on WARN
• add a watch comment noting some bizarre behaviour that could not be duplicated later.
• more fully handle large allocations spanning multiple reverse zones (eg, /23 dynamic DSL spans 2 /24 reverse zones)
• retrieve the DNS pattern from the parent in case of zone-spanning block deletes; the records in the zone can't be relied on to rebuild an "unused"-ish record in this case.

Should use dnsadmin:trunk/@r460 or higher for proper behaviour.

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (6 diffs)
• cgi-bin/main.cgi (modified) (2 diffs)
• templates/finaldelete.tmpl (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -254 +254 @@
 sub addMaster {
   my $dbh = shift;
+        # warning!  during testing, this somehow generated a "Bad file descriptor" error.  O_o
   my $cidr = new NetAddr::IP shift;
   my %args = @_;
@@ -1261 +1262 @@
       eval { $dbh->rollback; };
       return ('FAIL', $msg);
+    }
+
+    # Have to handle potentially split reverse zones.  Assume they *are* split,
+    # since if we added them here, they would have been added split.
+# allow splitting reverse zones to be disabled, maybe, someday
+#if ($splitrevzones && !$cidr->{isv6}) {
+    my @zonelist;
+    if (1 && !$cidr->{isv6}) {
+      my $splitpoint = ($cidr->masklen <= 16 ? 16 : 24);        # hack pthui
+      @zonelist = $cidr->split($splitpoint);
     } else {
-##fixme:  RPC return code?
-      _rpc('delZone', zone => "$cidr", user => $user, revrec => 'y');
-      return ('OK',"OK");
-    }
+      @zonelist = ($cidr);
+    }
+    my @fails;
+    foreach my $subzone (@zonelist) {
+      if ($rpc_url && !_rpc('delZone', zone => "$subzone", revrec => 'y', user => $user, delforward => $delfwd) ) {
+        push @fails, ("$subzone" => $errstr);
+      }
+    }
+    if (@fails) {
+      return ('WARN',"Warning(s) deleting $cidr from reverse DNS:\n".join("\n", @fails));
+    }
+    return ('OK','OK');
 
   } else { # end alloctype master block case
@@ -1275 +1294 @@
 
     my $retcode = 'OK';
+    my ($ptype,$pcity,$ppatt);
 
     eval {
@@ -1289 +1309 @@
 
 ##fixme:  we could maybe eliminate a special case if we put masterblocks in the allocations table...?
-      my ($ptype,$pcity);
       if ($rdepth == 1) {
         # parent is a master block.
         $ptype = 'mm';
         $pcity = '<NULL>';
+        $ppatt = $dbh->selectrow_array("SELECT rdns FROM masterblocks WHERE cidr=?", undef, ($parent) );
       } else {
         # get that parent's details
-        ($ptype,$pcity) = $dbh->selectrow_array("SELECT type,city FROM allocations ".
+        ($ptype,$pcity,$ppatt) = $dbh->selectrow_array("SELECT type,city,rdns FROM allocations ".
                 "WHERE cidr=? AND rdepth=?", undef, ($parent, $rdepth-1) );
       }
@@ -1321 +1341 @@
         $pcity = $tcity;
         ##fixme: hmm.  collect $rdepth into $goback here before vanishing?
-        $retcode = 'WARN';      # may be redundant
+        $retcode = 'WARNMERGE'; # may be redundant
         $goback = $tparent;
         # munge freeblock rdepth and parent to match true parent
@@ -1435 +1455 @@
     } else {
 ##fixme:  RPC return code?
-      _rpc('delByCIDR', cidr => "$cidr", user => $user, delforward => $delfwd, delsubs => 'y');
+      _rpc('delByCIDR', cidr => "$cidr", user => $user, delforward => $delfwd, delsubs => 'y', parpatt => $ppatt);
       return ($retcode, $goback);
     }

trunk/cgi-bin/main.cgi

@@ -895 +895 @@
   $page->param(delparent => $blockinfo->{parent}) if $webvar{rdepth};
   $page->param(prdepth => $webvar{rdepth});
-  if ($code =~ /^WARN/) {
+  if ($code =~ /^WARN(POOL|MERGE)/) {
     my ($bp,$bd) = split /,/, $msg;
     $page->param(bparent => $bp);
@@ -901 +901 @@
     $page->param(mergeip => $code eq 'WARNPOOL');
   }
-
+  if ($code eq 'WARN') {
+    $msg =~ s/\n/<br>\n/g;
+    $page->param(genwarn => $msg);
+  }
   if ($code eq 'OK' || $code =~ /^WARN/) {
     syslog "notice", "$authuser deallocated '$webvar{alloctype}'-type netblock $webvar{block} ".

trunk/templates/finaldelete.tmpl

@@ -5 +5 @@
 <TMPL_ELSE>
 <div class="heading">Success!  <TMPL_VAR NAME=block> deallocated.</div>
+<TMPL_IF genwarn><br><div><TMPL_VAR NAME=genwarn></div></TMPL_IF>
 <TMPL_IF bparent><br><div>
 Warning: