Changeset 273

Timestamp:

03/13/12 15:44:07 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

updateRec() should now handle all record update changes

File:

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

trunk/DNSDB.pm

@@ -396 +396 @@
                 " WHERE val = ?", undef, ($checkme)) };
         return ('WARN', "PTR record for $checkme already exists;  adding another will probably not do what you want")
-                unless (grep /^$args{update}$/, @ptrs);
+                if @ptrs && (!grep /^$args{update}$/, @ptrs);
       } else {
         # New record.  Always warn if a PTR exists
@@ -436 +436 @@
   my $pname = ($args{defrec} eq 'y' ? 'DOMAIN' : domainName($dbh,$args{id}));
   ${$args{host}} =~ s/\.*$/\.$pname/ if ${$args{host}} !~ /$pname$/;
+
+# hmm..  this might work.  except possibly for something pointing to "deadbeef.ca".  <g>
+#  if ($type == $reverse_typemap{NS} || $type == $reverse_typemap{MX} || $type == $reverse_typemap{SRV}) {
+#    if ($val =~ /^\s*[\da-f:.]+\s*$/) {
+#      return ('FAIL',"$val is not a valid IP address") if !$addr;
+#    }
+#  }
 
   return ('OK','OK');
@@ -563 +570 @@
         my @ptrs = @{ $dbh->selectcol_arrayref("SELECT record_id FROM "._rectable($args{defrec},$args{revrec}).
                 " WHERE val = ?", undef, (${$args{val}})) };
-        unless (grep /^$args{update}$/, @ptrs) {
+        if (@ptrs && (!grep /^$args{update}$/, @ptrs)) {
           $msg = "PTR record for ${$args{val}} already exists;  adding another will probably not do what you want";
           $code = 'WARN';
@@ -2360 +2367 @@
 ## DNSDB::updateRec()
 # Update a record
+# Takes a database handle, default and reverse flags, record ID, immediate parent ID, and new record data.
+# Returns a status code and message
 sub updateRec {
   $errstr = '';
@@ -2369 +2378 @@
   my $parid = shift;    # immediate parent entity that we're descending from to update the record
 
-# all records have these
+  # all records have these
   my $host = shift;
   my $hostbk = $$host;  # Keep a backup copy of the original, so we can WARN if the update mangles the domain
@@ -2386 +2395 @@
   my $retmsg = '';
 
-# do simple validation first
+  # do simple validation first
   return ('FAIL', "TTL must be numeric") unless $ttl =~ /^\d+$/;
 
@@ -2392 +2401 @@
   # domain names technically are case-insensitive, and we use printf-like % codes for a couple
   # of types.  Other things may also be added to validate default records of several flavours.
-  return ('FAIL', "Hostnames may not contain anything other than (0-9 a-z . _)")
+  return ('FAIL', "Hostnames may not contain anything other than (0-9 a-z - . _)")
         if $defrec eq 'n' && $$host !~ /^[0-9a-z_%.-]+$/i;
-##work
-
-# only MX and SRV will use these
+
+  # only MX and SRV will use these
   my $dist = 0;
   my $weight = 0;
   my $port = 0;
 
-# standard validation
   my $fields;
   my @vallist;
 
-##fixme
-# get old record data so we can compare the old/new domain_id and rdns_id
-my $oldrec = getRecLine($dbh, $defrec, $revrec, $id);
-use Data::Dumper;
-#print Dumper($oldrec);
+  # get old record data so we have the right parent ID
+  # and for logging (eventually)
+  my $oldrec = getRecLine($dbh, $defrec, $revrec, $id);
 
   # Call the validation sub for the type requested.
@@ -2422 +2427 @@
   return ($retcode,$retmsg) if $retcode eq 'FAIL';
 
-  # Set up database fields and bind parameters
-  $fields .= "host,type,val,ttl";
-  push @vallist, ($$host,$$rectype,$$val,$ttl);
-#push @vallist, 
-#($defrec eq 'y' ? $oldrec->{group_id} : ($revrec eq 'n' ? $oldrec->{domain_id} : $oldrec->{rdns_id}));
-
-  my $vallen = '?'.(',?'x$#vallist);
-
-#print "$fields\n";
-#print join(',', @vallist)."\n";
-
-# hmm..  this might work.  except possibly for something pointing to "deadbeef.ca".  <g>
-#  if ($type == $reverse_typemap{NS} || $type == $reverse_typemap{MX} || $type == $reverse_typemap{SRV}) {
-#    if ($val =~ /^\s*[\da-f:.]+\s*$/) {
-#      return ('FAIL',"$val is not a valid IP address") if !$addr;
-#    }
-#  }
+  # Set up database fields and bind parameters.  Note only the optional fields
+  # (distance, weight, port, secondary parent ID) are added in the validation call above
+  $fields .= "host,type,val,ttl,"._recparent($defrec,$revrec);
+  push @vallist, ($$host,$$rectype,$$val,$ttl,
+        ($defrec eq 'y' ? $oldrec->{group_id} : ($revrec eq 'n' ? $oldrec->{domain_id} : $oldrec->{rdns_id})) );
+
+  # hack hack PTHUI
+  # need to forcibly make sure we disassociate a record with a parent it's no longer related to.
+  # eg, PTR records may not have a domain parent, or A/AAAA records may not have a revzone parent.
+  # mainly needed for crossover types that got coerced down to "standard" types
+  if ($defrec eq 'n') {
+    if ($$rectype == $reverse_typemap{PTR}) {
+      $fields .= ",domain_id";
+      push @vallist, 0;
+    }
+    if ($$rectype == $reverse_typemap{A} || $$rectype == $reverse_typemap{AAAA}) {
+      $fields .= ",rdns_id";
+      push @vallist, 0;
+    }
+  }
+
+  # Fiddle the field list into something suitable for updates
+  $fields =~ s/,/=?,/g;
+  $fields .= "=?";
 
   local $dbh->{AutoCommit} = 0;
@@ -2444 +2456 @@
 
   eval {
-    $dbh->do("UPDATE ".($defrec eq 'y' ? 'default_' : '')."records ".
-        "SET host=?,val=?,type=?,ttl=?,distance=?,weight=?,port=? ".
-        "WHERE record_id=?", undef, ($$host, $$val, $$rectype, $ttl, $dist, $weight, $port, $id) );
-#die "horribly";
+    $dbh->do("UPDATE "._rectable($defrec,$revrec)." SET $fields WHERE record_id=?", undef, (@vallist, $id) );
     $dbh->commit;
   };
@@ -2457 +2466 @@
 
   return ($retcode, $retmsg);
-#  return ('OK','OK');
 } # end updateRec()