Changeset 454 for trunk

Timestamp:

01/16/13 16:43:19 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweak addOrUpdateRec for some subtle bugs. See #43.

• handle static IP CIDRs correctly (strip the mask length)
• make sure to check all template, composite, and bare PTR records

File:

• trunk/dns-rpc.cgi (modified) (3 diffs)

trunk/dns-rpc.cgi

@@ -443 +443 @@
     my $zone = new NetAddr::IP $zonelist->[0]->{revnet};
     if ($zone->contains($args{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 $reclist = DNSDB::getDomRecs($dbh, defrec => 'n', revrec => 'y',
-        id => $zonelist->[0]->{rdns_id}, filter => "$args{cidr}");
+        id => $zonelist->[0]->{rdns_id}, filter => $filt);
       if (scalar(@$reclist) == 0) {
         # Aren't Magic Numbers Fun?  See pseudotype list in dnsadmin.
@@ -452 +454 @@
       } else {
         foreach my $rec (@$reclist) {
-          next unless $rec->{type} == 65282 || $rec->{type} == 65283 || $rec->{type} == 65284;
+          # pure PTR plus composite types
+          next unless $rec->{type} == 12 || $rec->{type} == 65280 || $rec->{type} == 65281
+                || $rec->{type} == 65282 || $rec->{type} == 65283 || $rec->{type} == 65284;
+          next unless $rec->{val} eq $filt;     # make sure we really update the record we want to update.
           updateRec(defrec =>'n', revrec => 'y', id => $rec->{record_id},
             parent_id => $zonelist->[0]->{rdns_id}, %args);
@@ -473 +478 @@
       } 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},