Changeset 452

Timestamp:

01/11/13 12:21:13 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Continue tweaking RPC for actual usage. See #43.

• Add and expose getRevPattern() to retrieve the narrowest template pattern applicable to a passed CIDR (netblock or IP)
• Add and expose getZonesByCIDR() to retrieve a list of revzones and zone IDs for records within a passed CIDR block. Note the block may be larger than the zones, so we may return more than one revzone.

Location:

trunk

Files:

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

trunk/DNSDB.pm

@@ -52 +52 @@
         &addRec &updateRec &delRec
         &getLogCount &getLogEntries
+        &getRevPattern
         &getTypelist
         &parentID
         &isParent
-        &zoneStatus &importAXFR
+        &zoneStatus &getZonesByCIDR &importAXFR
         &export
         &mailNotify
@@ -79 +80 @@
                 &addRec &updateRec &delRec
                 &getLogCount &getLogEntries
+                &getRevPattern
                 &getTypelist
                 &parentID
                 &isParent
-                &zoneStatus &importAXFR
+                &zoneStatus &getZonesByCIDR &importAXFR
                 &export
                 &mailNotify
@@ -3926 +3928 @@
 
 
+## IPDB::getRevPattern()
+# Get the narrowest template pattern applicable to a passed CIDR address (may be a netblock or an IP)
+sub getRevPattern {
+  my $dbh = shift;
+  my $cidr = shift;
+  my $group = shift || 1;       # just in case
+
+  my ($revpatt) = $dbh->selectrow_array("SELECT r.host FROM records r JOIN revzones z ON r.rdns_id=z.rdns_id ".
+        "WHERE r.type=65282 OR r.type=65283 AND z.group_id=? AND CAST (r.val AS inet) >>= ? ".
+        "ORDER BY CAST (r.val AS inet) DESC LIMIT 1", undef, ($group, $cidr) );
+  return $revpatt;
+} # end getRevPattern()
+
+
 ## DNSDB::getTypelist()
 # Get a list of record types for various UI dropdowns
@@ -4153 +4169 @@
   return $status;
 } # end zoneStatus()
+
+
+## DNSDB::getZonesByCIDR()
+# Get a list of zone names and IDs that records for a passed CIDR block are within.
+sub getZonesByCIDR {
+  my $dbh = shift;
+  my %args = @_;
+
+  my $result = $dbh->selectall_arrayref("SELECT rdns_id,revnet FROM revzones WHERE revnet >>= ? OR revnet <<= ?",
+        { Slice => {} }, ($args{cidr}, $args{cidr}) );
+  return $result;
+} # end getZonesByCIDR()
 
 

trunk/dns-rpc.cgi

@@ -64 +64 @@
         'dnsdb.updateRec'       => \&updateRec,
         'dnsdb.delRec'          => \&delRec,
+#sub getLogCount {}
+#sub getLogEntries {}
+        'dnsdb.getRevPattern'   => \&getRevPattern,
         'dnsdb.zoneStatus'      => \&zoneStatus,
+        'dnsdb.getZonesByCIDR'  => \&getZonesByCIDR,
 
         'dnsdb.getMethods'      => \&get_method_list
@@ -371 +375 @@
   }
 
+  # 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};
+  }
+
   my @recargs = ($dbh, $args{defrec}, $args{revrec}, $args{parent_id},
         \$args{name}, \$args{type}, \$args{address}, $args{ttl}, $args{location});
@@ -392 +402 @@
   _commoncheck(\%args, 'y');
 
+  # get old line, so we can update only the bits that the caller passed to change
+  # note we subbed address for val since it's a little more caller-friendly
+  my $oldrec = DNSDB::getRecLine($dbh, $args{defrec}, $args{revrec}, $args{id});
+  foreach my $field (qw(name type address ttl location distance weight port)) {
+    $args{$field} = $oldrec->{$field} if !$args{$field} && defined($oldrec->{$field});
+  }
+
   # note dist, weight, port are not required on all types;  will be ignored if not needed.
   # parent_id is the "primary" zone we're updating;  necessary for forward/reverse voodoo
@@ -415 +432 @@
 #sub getLogCount {}
 #sub getLogEntries {}
+
+sub getRevPattern {
+  my %args = @_;
+
+  _commoncheck(\%args, 'y');
+
+  return DNSDB::getRevPattern($dbh, $args{cidr}, $args{group});
+}
+
 #sub getTypelist {}
 #sub parentID {}
@@ -428 +454 @@
 
   my $status = DNSDB::zoneStatus(@arglist);
+}
+
+# Get a list of hashes referencing the reverse zone(s) for a passed CIDR block
+sub getZonesByCIDR {
+  my %args = @_;
+
+  _commoncheck(\%args, 'y');
+
+  return DNSDB::getZonesByCIDR($dbh, %args);
 }