Changeset 978 for branches

Timestamp:

01/09/26 15:09:27 (34 hours ago)

Author:

Kris Deugau

Message:

/branches/cname-collision

Fold the "not-a-CNAME" and "only-CNAME" lookups into a loop to avoid
mistake-prone copypasta in extending CNAME collision checks further
See #72

File:

• branches/cname-collision/DNSDB.pm (modified) (2 diffs)

branches/cname-collision/DNSDB.pm

@@ -635 +635 @@
 #  my $msg = 'OK';
 
-  if (${$args{rectype}} == 5) {
+  # The record type comparison is the only difference between two passes through this chunk of code.
+  # CNAME records require both passes, where other records only need the second one.  Downside is
+  # that returning error messages needs to check the loop variable on top of whatever else it references.
+  foreach my $tcompare ('<>', '=') {
+    next if $tcompare eq '<>' && ${$args{rectype}} != 5;
     # First, check for non-CNAME collisions.
     my $sql = "SELECT count(*) FROM "._rectable($args{defrec}, $args{revrec}).
-        " WHERE "._recparent($args{defrec}, $args{revrec})." = ? AND type <> 5 AND $hfield = ?";
+        " WHERE "._recparent($args{defrec}, $args{revrec})." = ? AND type $tcompare 5 AND $hfield = ?";
     if ($args{defrec} eq 'n') {
       # Expired records
@@ -650 +654 @@
     my @t = $dbh->selectrow_array($sql, undef, @lookupargs);
     if ($t[0] > 0) {
-      $errstr = "One or more non-CNAME records already exist for ".($args{revrec} eq 'y' ? $arpaname : $hcheck).
-        ".  CNAME records cannot use the same name as other records.";
+      if ($tcompare eq '<>') {
+        $errstr = "One or more non-CNAME records already exist for ".($args{revrec} eq 'y' ? $arpaname : $hcheck).
+                ".  CNAME records cannot use the same name as other records.";
+      } else {
+        $errstr = "There is already a CNAME present for ".($args{revrec} eq 'y' ? $arpaname : $hcheck).
+                ".  Only one CNAME may be present for a given name.";
+      }
       return;
     }
-  }
-
-  # Second, check for multiple CNAMEs
-  my $sql = "SELECT count(*) FROM "._rectable($args{defrec}, $args{revrec}).
-        " WHERE "._recparent($args{defrec}, $args{revrec})." = ? AND type = 5 AND $hfield = ?";
-  if ($args{defrec} eq 'n') {
-    # Expired records
-    $sql .= " AND (stampactive = 'f' OR (stampactive = 't' AND (expires = 't' AND stamp >= now())))";
-  }
-  my @lookupargs = ($args{id}, $hcheck);
-  if ($args{update}) {
-    $sql .= " AND record_id <> ?";
-    push @lookupargs, $args{update};
-  }
-  my @t = $dbh->selectrow_array($sql, undef, @lookupargs);
-  if ($t[0] > 0) {
-    $errstr = "There is already a CNAME present for ".($args{revrec} eq 'y' ? $arpaname : $hcheck).
-        ".  Only one CNAME may be present for a given name.";
-    return;
   }