Changeset 459

Timestamp:

01/22/13 17:24:43 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Flesh out last known subcases of record update/delete required
for IPDB RPC service. See #43.

• Add new sub delByCIDR(). Requires new DNSDB::downconvert utility sub.
• Use a new variable instead of overwriting $args{cidr} in addOrUpdateRevRec()
• Catch and another special case - adding a /32 ("netblock" or static IP) at the very beginning of a larger block in addOrUpdateRevRec()

Location:

trunk

Files:

• DNSDB.pm (modified) (1 diff)
• dns-rpc.cgi (modified) (5 diffs)

trunk/DNSDB.pm

@@ -3796 +3796 @@
   return ($retcode, $retmsg);
 } # end updateRec()
+
+
+## DNSDB::downconvert()
+# A mostly internal (not exported) semiutilty sub to downconvert from pseudotype <x>
+# to a compatible component type.  Only a handful of operations are valid, anything
+# else is a null-op.
+# Takes the record ID and the new type.  Returns boolean.
+sub downconvert {
+  my $dbh = shift;
+  my $recid = shift;
+  my $newtype = shift;
+
+  # also, only work on live records;  little to no value trying to do this on default records.
+  my $rec = getRecLine($dbh, 'n', 'y', $recid);
+
+  # hm?
+  #return 1 if !$rec;
+
+  return 1 if $rec->{type} < 65000;     # Only the reverse-record pseudotypes can be downconverted
+  return 1 if $rec->{type} == 65282;    # Nowhere to go
+
+  my $delpar;
+  my @sqlargs;
+  if ($rec->{type} == 65280) {
+    return 1 if $newtype != 1 && $newtype != 12;
+    $delpar = ($newtype == 1 ? 'rdns_id' : 'domain_id');
+    push @sqlargs, 0, $newtype, $recid;
+  } elsif ($rec->{type} == 65281) {
+    return 1 if $newtype != 28 && $newtype != 12;
+    $delpar = ($newtype == 28 ? 'rdns_id' : 'domain_id');
+    push @sqlargs, 0, $newtype, $recid;
+  } elsif ($rec->{type} == 65283) {
+    return 1 if $newtype != 65282;
+    $delpar = 'rdns_id';
+  } elsif ($rec->{type} == 65284) {
+    return 1 if $newtype != 65282;
+    $delpar = 'rdns_id';
+  } else {
+    # Your llama is on fire.
+  }
+
+  local $dbh->{AutoCommit} = 0;
+  local $dbh->{RaiseError} = 1;
+
+  eval {
+    $dbh->do("UPDATE records SET $delpar = ?, type = ? WHERE record_id = ?", undef, @sqlargs);
+    $dbh->commit;
+  };
+  if ($@) {
+    $errstr = $@;
+    eval { $dbh->rollback; };
+    return 0;
+  }
+  return 1;
+} # end downconvert()
 
 

trunk/dns-rpc.cgi

@@ -65 +65 @@
         'dnsdb.addOrUpdateRevRec'       => \&addOrUpdateRevRec,
         'dnsdb.delRec'          => \&delRec,
+        'dnsdb.delByCIDR'       => \&delByCIDR,
 #sub getLogCount {}
 #sub getLogEntries {}
@@ -434 +435 @@
 
   _commoncheck(\%args, 'y');
-  $args{cidr} = new NetAddr::IP $args{cidr};
+  my $cidr = new NetAddr::IP $args{cidr};
 
   my $zonelist = DNSDB::getZonesByCIDR($dbh, %args);
@@ -442 +443 @@
     # check if the single zone returned is bigger than the CIDR.  if so, we can just add a record
     my $zone = new NetAddr::IP $zonelist->[0]->{revnet};
-    if ($zone->contains($args{cidr})) {
+    if ($zone->contains($cidr)) {
       # We need to strip the CIDR mask on IPv4 /32 assignments, or we just add a new record all the time.
-      my $filt = ($args{cidr}->{isv6} || $args{cidr}->masklen != 32 ? "$args{cidr}" : $args{cidr}->addr);
+      my $filt = ($cidr->{isv6} || $cidr->masklen != 32 ? "$cidr" : $cidr->addr);
       my $reclist = DNSDB::getDomRecs($dbh, defrec => 'n', revrec => 'y',
         id => $zonelist->[0]->{rdns_id}, filter => $filt);
       if (scalar(@$reclist) == 0) {
         # Aren't Magic Numbers Fun?  See pseudotype list in dnsadmin.
-        my $type = ($args{cidr}->{isv6} ? 65282 : ($args{cidr}->masklen == 32 ? 65280 : 65283) );
+        my $type = ($cidr->{isv6} ? 65282 : ($cidr->masklen == 32 ? 65280 : 65283) );
         addRec(defrec =>'n', revrec => 'y', parent_id => $zonelist->[0]->{rdns_id}, type => $type,
-          address => "$args{cidr}", %args);
+          address => "$cidr", %args);
       } else {
+        my $flag = 0;
         foreach my $rec (@$reclist) {
           # pure PTR plus composite types
@@ -460 +462 @@
           updateRec(defrec =>'n', revrec => 'y', id => $rec->{record_id},
             parent_id => $zonelist->[0]->{rdns_id}, %args);
+          $flag = 1;
           last; # only do one record.
+        }
+        unless ($flag) {
+          # Nothing was updated, so we didn't really have a match.  Add as per @$reclist==0
+          # Aren't Magic Numbers Fun?  See pseudotype list in dnsadmin.
+          my $type = ($cidr->{isv6} ? 65282 : ($cidr->masklen == 32 ? 65280 : 65283) );
+          addRec(defrec =>'n', revrec => 'y', parent_id => $zonelist->[0]->{rdns_id}, type => $type,
+            address => "$cidr", %args);
         }
       }
@@ -501 +511 @@
 }
 
+sub delByCIDR {
+  my %args = @_;
+
+  _commoncheck(\%args, 'y');
+
+  # much like addOrUpdateRevRec()
+  my $zonelist = DNSDB::getZonesByCIDR($dbh, %args);
+  my $cidr = new NetAddr::IP $args{cidr};
+
+  if (scalar(@$zonelist) == 0) {
+    # enhh....  WTF?
+  } elsif (scalar(@$zonelist) == 1) {
+
+    # check if the single zone returned is bigger than the CIDR
+    my $zone = new NetAddr::IP $zonelist->[0]->{revnet};
+    if ($zone->contains($cidr)) {
+
+      if ($args{delsubs}) {
+        # Delete ALL EVARYTHING!!one11!! in $args{cidr}
+        my $reclist = DNSDB::getDomRecs($dbh, defrec => 'n', revrec => 'y', id => $zonelist->[0]->{rdns_id});
+        foreach my $rec (@$reclist) {
+          my $reccidr = new NetAddr::IP $rec->{val};
+          next unless $cidr->contains($reccidr);
+          ##fixme:  multiple records, wanna wax'em all, how to report errors?
+          if ($args{delforward} ||
+              $rec->{type} == 12 || $rec->{type} == 65282 ||
+              $rec->{type} == 65283 || $rec->{type} == 65284) {
+            my ($code,$msg) = DNSDB::delRec($dbh, 'n', 'y', $rec->{record_id});
+          } else {
+            my $ret = DNSDB::downconvert($dbh, $rec->{record_id}, $DNSDB::reverse_typemap{A});
+          }
+        }
+
+      } else {
+        # Selectively delete only exact matches on $args{cidr}
+
+        # We need to strip the CIDR mask on IPv4 /32 assignments, or we can't find single-IP records
+        my $filt = ($cidr->{isv6} || $cidr->masklen != 32 ? "$cidr" : $cidr->addr);
+        my $reclist = DNSDB::getDomRecs($dbh, defrec => 'n', revrec => 'y',
+          id => $zonelist->[0]->{rdns_id}, filter => $filt, sortby => 'val', sortorder => 'DESC');
+        foreach my $rec (@$reclist) {
+          my $reccidr = new NetAddr::IP $rec->{val};
+          next unless $cidr == $reccidr;
+          if ($args{delforward} || $rec->{type} == 12) {
+            my ($code,$msg) = DNSDB::delRec($dbh, 'n', 'y', $rec->{record_id});
+            die $msg if $code eq 'FAIL';
+            return $msg;
+          } else {
+            my $ret = DNSDB::downconvert($dbh, $rec->{record_id}, $DNSDB::reverse_typemap{A});
+            die $DNSDB::errstr if !$ret;
+            return "A+PTR for $args{cidr} split and PTR removed";
+          }
+        } # foreach @$reclist
+      }
+
+    } else {  # $cidr > $zone but we only have one zone
+      # ebbeh?  CIDR is only partly represented in DNS.  This needs manual intervention.
+      return "Warning:  $args{cidr} is only partly represented in DNS.  Check and remove DNS records manually.";
+    } # done single-zone-contains-$cidr
+
+  } else {  # multiple zones nominally "contain" $cidr
+    # Overlapping reverse zones shouldn't be possible, so if we're here we've got a CIDR
+    # that spans multiple reverse zones (eg, /23 CIDR -> 2 /24 rzones)
+    foreach my $zdata (@$zonelist) {
+      my $reclist = DNSDB::getDomRecs($dbh, defrec => 'n', revrec => 'y',
+        id => $zdata->{rdns_id}, filter => $zdata->{revnet});
+      if (scalar(@$reclist) == 0) {
+        my $type = ($args{cidr}->{isv6} ? 65282 : ($args{cidr}->masklen == 32 ? 65280 : 65283) );
+        addRec(defrec =>'n', revrec => 'y', parent_id => $zdata->{rdns_id}, type => $type,
+          address => "$args{cidr}", %args);
+      } else {
+        foreach my $rec (@$reclist) {
+          # only the composite and/or template types;  pure PTR or nontemplate composite
+          # types are nominally impossible here.
+          next unless $rec->{type} == 65282 || $rec->{type} == 65283 || $rec->{type} == 65284;
+          updateRec(defrec =>'n', revrec => 'y', id => $rec->{record_id},
+            parent_id => $zdata->{rdns_id}, %args);
+          last; # only do one record.
+        } # foreach @$reclist
+      }
+    } # iterate zones within $cidr
+  } # done $cidr-contains-zones
+
+} # end delByCIDR()
+
 #sub getLogCount {}
 #sub getLogEntries {}