Changeset 453 for trunk

Timestamp:

01/15/13 18:15:32 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Continue extending RPC support for real usage/needs. See #43.

Add addOrUpdateRec() to RPC interface to simplify calls and reduce
multiple-call time cost (0.3-0.5s for the XML-RPC client to decode
the response on each call?!? - must fix!)

File:

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

trunk/dns-rpc.cgi

@@ -63 +63 @@
         'dnsdb.addRec'          => \&addRec,
         'dnsdb.updateRec'       => \&updateRec,
+        'dnsdb.addOrUpdateRevRec'       => \&addOrUpdateRevRec,
         'dnsdb.delRec'          => \&delRec,
 #sub getLogCount {}
@@ -111 +112 @@
         unless DNSDB::initRPC($dbh, (username => $argref->{rpcuser}, rpcsys => $argref->{rpcsystem},
                 fullname => ($argref->{fullname} ? $argref->{fullname} : $argref->{rpcuser}) ) );
+  }
+}
+
+# set location to the zone's default location if none is specified
+sub _loccheck {
+  my $argref = shift;
+  if (!$argref->{location} && $argref->{defrec} eq 'n') {
+    $argref->{location} = DNSDB::getZoneLocation($dbh, $argref->{revrec}, $argref->{parent_id});
+  }
+}
+
+# set ttl to zone defailt minttl if none is specified
+sub _ttlcheck {
+  my $argref = shift;
+  if (!$argref->{ttl}) {
+    my $tmp = DNSDB::getSOA($dbh, $argref->{defrec}, $argref->{revrec}, $argref->{parent_id});
+    $argref->{ttl} = $tmp->{minttl};
   }
 }
@@ -370 +388 @@
   _commoncheck(\%args, 'y');
 
-  # add records in the zone's default location if none is specified
-  if (!$args{location} && $args{defrec} eq 'n') {
-    $args{location} = DNSDB::getZoneLocation($dbh, $args{revrec}, $args{parent_id});
-  }
-
-  # callers may often not care about TTLs
-  if (!$args{ttl}) {
-    my $tmp = DNSDB::getSOA($dbh, $args{defrec}, $args{revrec}, $args{parent_id});
-    $args{ttl} = $tmp->{minttl};
-  }
+  _loccheck(\%args);
+  _ttlcheck(\%args);
 
   my @recargs = ($dbh, $args{defrec}, $args{revrec}, $args{parent_id},
@@ -419 +429 @@
 }
 
+# Takes a passed CIDR block and DNS pattern;  adds a new record or updates the record(s) affected
+sub addOrUpdateRevRec {
+  my %args = @_;
+
+  _commoncheck(\%args, 'y');
+  $args{cidr} = new NetAddr::IP $args{cidr};
+
+  my $zonelist = DNSDB::getZonesByCIDR($dbh, %args);
+  if (scalar(@$zonelist) == 0) {
+    # enhh....  WTF?
+  } elsif (scalar(@$zonelist) == 1) {
+    # 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})) {
+      my $reclist = DNSDB::getDomRecs($dbh, defrec => 'n', revrec => 'y',
+        id => $zonelist->[0]->{rdns_id}, filter => "$args{cidr}");
+      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) );
+        addRec(defrec =>'n', revrec => 'y', parent_id => $zonelist->[0]->{rdns_id}, type => $type,
+          address => "$args{cidr}", %args);
+      } else {
+        foreach my $rec (@$reclist) {
+          next unless $rec->{type} == 65282 || $rec->{type} == 65283 || $rec->{type} == 65284;
+          updateRec(defrec =>'n', revrec => 'y', id => $rec->{record_id},
+            parent_id => $zonelist->[0]->{rdns_id}, %args);
+          last; # only do one record.
+        }
+      }
+    } else {
+      # ebbeh?  CIDR is only partly represented in DNS.  This needs manual intervention.
+    } # done single-zone-contains-$cidr
+  } else {
+    # 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) {
+          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.
+        }
+      }
+    } # iterate zones within $cidr
+  } # done $cidr-contains-zones
+}
+
 sub delRec {
   my %args = @_;