Changeset 249

Timestamp:

02/29/12 12:42:40 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix lurking bug in SQL tabledef from early idea for default rdns
records
Fix logic bugs in A+PTR creation in default records:

• we should NOT blindly prepend 'ZONE.' if it's present in the value/IP
• we should not blindly append $config{domain} if ADMINDOMAIN is in the hostname
• we need to check for "ZONE.1", "ZONE,1", and "ZONE::1" in the "does this PTR exist?" check because otherwise we'll silently end up with duplicates

Minor tweak to call to addRec() so that changes from validation
get propagated all the way back up the call chain.
See #26

Location:

trunk

Files:

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

trunk/DNSDB.pm

@@ -346 +346 @@
           ${$args{val}} = $args{addr}->addr;
         } else {
-          ${$args{val}} =~ s/^\.*/ZONE./;
+          ${$args{val}} =~ s/^\.*/ZONE./ unless ${$args{val}} =~ /^ZONE/;
         }
       } elsif (${$args{val}} =~ /[a-f:]/) {
@@ -363 +363 @@
         ${$args{val}} = "ZONE,${$args{val}}";
       }
-      ${$args{host}} =~ s/\.*$/\.$config{domain}/ if ${$args{host}} !~ /$config{domain}$/;
+      ${$args{host}} =~ s/\.*$/\.$config{domain}/ if ${$args{host}} !~ /(?:$config{domain}|ADMINDOMAIN)$/;
     }
 
@@ -369 +369 @@
 # and tend to fail in the most awkward way possible.  Check and warn.
 # We use $val instead of $addr->addr since we may be in a defrec, and may have eg "ZONE::42" or "ZONE.12"
-    my ($ptrcount) = $dbh->selectrow_array("SELECT count(*) FROM "._rectable($args{defrec},$args{revrec}).
-        " WHERE val = ?", undef, ${$args{val}});
-    return ('WARN', "PTR record for ${$args{val}} already exists;  adding another will probably not do what you want")
+
+    my @checkvals = (${$args{val}});
+    if (${$args{val}} =~ /,/) {
+      # push . and :: variants into checkvals if val has ,
+      my $tmp;
+      ($tmp = ${$args{val}}) =~ s/,/./;
+      push @checkvals, $tmp;
+      ($tmp = ${$args{val}}) =~ s/,/::/;
+      push @checkvals, $tmp;
+    }
+    my $pcsth = $dbh->prepare("SELECT count(*) FROM "._rectable($args{defrec},$args{revrec})." WHERE val = ?");
+    foreach my $checkme (@checkvals) {
+      my $ptrcount;
+      ($ptrcount) = $dbh->selectrow_array("SELECT count(*) FROM "._rectable($args{defrec},$args{revrec}).
+        " WHERE val = ?", undef, ($checkme));
+      return ('WARN', "PTR record for $checkme already exists;  adding another will probably not do what you want")
         if $ptrcount;
+    }
   } else {
     # Not absolutely true but only useful if you hack things up for sub-/24 v4 reverse delegations
@@ -2010 +2024 @@
   # Call the validation sub for the type requested.
   ($retcode,$retmsg) = $validators{$$rectype}($dbh, (defrec => $defrec, revrec => $revrec, id => $id,
-        host => \$host, rectype => $rectype, val => \$val, addr => $addr,
+        host => $host, rectype => $rectype, val => $val, addr => $addr,
         dist => \$dist, port => \$port, weight => \$weight,
         fields => \$fields, vallist => \@vallist) );
@@ -2018 +2032 @@
   # Set up database fields and bind parameters
   $fields .= "host,type,val,ttl,"._recparent($defrec,$revrec);
-  push @vallist, ($host,$$rectype,$val,$ttl,$id);
+  push @vallist, ($$host,$$rectype,$$val,$ttl,$id);
   my $vallen = '?'.(',?'x$#vallist);
 

trunk/dns.cgi

@@ -560 +560 @@
 
     my @recargs = ($dbh,$webvar{defrec},$webvar{revrec},$webvar{parentid},
-        $webvar{name},\$webvar{type},$webvar{address},$webvar{ttl});
+        \$webvar{name},\$webvar{type},\$webvar{address},$webvar{ttl});
     if ($webvar{type} == $reverse_typemap{MX} or $webvar{type} == $reverse_typemap{SRV}) {
       push @recargs, $webvar{distance};

trunk/dns.sql

@@ -51 +51 @@
 );
 
-COPY default_rev_records (record_id, group_id, host, "type", ip, ttl, description) FROM stdin;
+COPY default_rev_records (record_id, group_id, host, "type", val, ttl, description) FROM stdin;
 1       1       hostmaster.ADMINDOMAIN:ns1.ADMINDOMAIN  6       3600:900:1048576:2560   3600    
 2       1       unused-%r.ADMINDOMAIN   65283   ZONE    3600