Changeset 264 for trunk

Timestamp:

03/05/12 18:05:39 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint; reverse records that don't match the zone (v4/v6) are skipped
Reverse records that can't fit in the zone are also skipped (... sort of,
still needs work)
Replacing ZONE in value/IP mostly done
See #26

File:

• trunk/DNSDB.pm (modified) (4 diffs)

trunk/DNSDB.pm

@@ -1260 +1260 @@
   local $dbh->{RaiseError} = 1;
 
-#$dbh->selectrow_array("SELECT currval('users_user_id_seq')");
+  my $warnstr = '';
+
   # Wrap all the SQL in a transaction
   eval {
@@ -1268 +1269 @@
     # get the ID...
     ($rdns_id) = $dbh->selectrow_array("SELECT currval('revzones_rdns_id_seq')");
+#$dbh->selectrow_array("SELECT currval('users_user_id_seq')");
 
     _log($dbh, (rdns_id => $rdns_id, user_id => $userinfo{id}, group_id => $group, username => $userinfo{name},
@@ -1278 +1280 @@
     $sth->execute($group);
     while (my ($host,$type,$val,$ttl) = $sth->fetchrow_array()) {
+      # Silently skip v4/v6 mismatches.  This is not an error, this is expected.
+      if ($zone->{isv6}) {
+        next if ($type == 65280 || $type == 65283);
+      } else {
+        next if ($type == 65281 || $type == 65284);
+      }
       $host =~ s/ADMINDOMAIN/$config{domain}/g;
+
+## tmp
+sub _ZONE {
+  my $zone = shift;
+  my $string = shift;
+  my $t1 = shift;       # flag for IP/network or hostname
+  my $t2 = shift || 'f';        # flag for forward/reverse order?  nb: ignored for IP
+
+  my $prefix = $zone->network->addr;    # Just In Case someone managed to slip in
+                                        # a funky subnet that had host bits set.
+  $prefix =~ s/(:0)+$/::/;
+  $prefix =~ s/0$//;
+
+  if ($t1 eq 'net') {
+    $string =~ s/ZONE[:.]+/$prefix/;
+  } else {
+    $prefix =~ s/[:.]+$//;
+    if ($t2 eq 'f') {
+      $prefix =~ s/[:.]+/-/g;
+    } else {
+      $prefix = join('-', reverse(split(/[:.]/, $prefix)));
+    }
+    $string =~ s/ZONE/$prefix/;
+  }
+  return $string;
+}
+## tmp
+
+# Check the zone;  if it's v4 and smaller than a /24 (sub-octet), we need
+# to check any template IPs to make sure they're in range.
+##fixme: need similar check on v6, except we'll just grump at non-nibble boundaries
+# first-pass:  masklen must be divisible by 4
+if (!$zone->{isv6} && $zone->masklen > 24) {
+      my $net = $zone->network->addr;
+      my $bc = $zone->broadcast;
+      $net =~ s/^\d+\.\d+\.\d+\.//;
+      $bc =~ s/^\d+\.\d+\.\d+\.//;
+      my $tmp = $host;
+      $tmp =~ s/^ZONE\.//;
+      if ($net <= $tmp && $tmp <= $bc) {
+      # replace ZONE with actual netblock in IP/value
+        unless (my $tmpval = _ZONE($zone, $val, 'net')) {
+          $warnstr .= "$val does not fit in $zone;  skipping\n";
+          next;
+        }
+      } else {
+        $warnstr .= "Default record '$val $typemap{$type} $host' doesn't fit in $zone, skipping\n";
+      }
+}
+
 ##work
 # - replace ZONE in $val
-# - skip records not appropriate for the zone (skip A+PTR on v6 zones, and AAAA+PTR on v4 zones)
 #      $val =~ s/DOMAIN/$domain/g;
+
       $sth_in->execute($host,$type,$val,$ttl);
       if ($typemap{$type} eq 'SOA') {
@@ -1300 +1358 @@
       }
     }
+
+    # If there are warnings (presumably about default records skipped for cause) log them
+    _log($dbh, (rdns_id => $rdns_id, user_id => $userinfo{id}, group_id => $group,
+        username => $userinfo{name}, entry => $warnstr))
+        if $warnstr;
 
     # once we get here, we should have suceeded.