Changeset 937 for branches/cname-collision

Timestamp:

12/11/25 15:32:35 (24 hours ago)

Author:

Kris Deugau

Message:

/branches/cname-collision

First pass/chunk for a CNAME-collision sub
Comment much-simplified local check in CNAME validation sub, add prelimiary call to new sub
See #72.

File:

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

branches/cname-collision/DNSDB.pm

@@ -612 +612 @@
 ##
 
+# Check for name collisions relating to CNAMEs.  Needs to be called from all other validators.
+sub _cname_collision {
+#  my $self = shift;
+#  my $dbh = $self->{dbh};
+#
+#  my %args = @_;
+my ($hcheck,$defrec,$revrec) = @_;
+
+#  my $hcheck = ($args{revrec} eq 'y' ? ${$args{val}} : ${$args{host}});
+  my $hfield = ($args{revrec} eq 'y' ? 'val' : 'host');
+#my $hcheck = $hname;
+
+  # $hcheck should be normalized by the time this sub is called.  Convert to the formal .arpa name for error reporting in reverse zones.
+  my $arpaname = '';
+  if ($revrec eq 'y') {
+    $arpaname = NetAddr::IP->new($hcheck);
+##fixme:  more voodoo if global and/or per-user ARPA display mode flag set this way or that
+    $arpaname = _ZONE($arpaname, 'ZONE', 'r', '.').($arpaname->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
+  }
+
+#  my $ret = 'OK';
+#  my $msg = 'OK';
+
+  if ($args{type} == 5) {
+    # First, check for non-CNAME collisions.
+    my @t = $dbh->selectrow_array("SELECT count(*) FROM "._rectable($args{defrec}, $args{revrec}).
+        " WHERE "._recparent($args{defrec}, $args{revrec})." = ? AND type <> 5 AND $hfield = ?",
+        undef, $args{id}, $hcheck);
+    if ($t[0] > 0) {
+      $errstr = "One or more non-CNAME records already exist for ".($revrec eq 'y' ? $arpaname : $hcheck).
+        ".  CNAME records cannot use the same name as other records.";
+      return;
+    }
+  }
+
+  # Second, check for multiple CNAMEs
+  my @t = $dbh->selectrow_array("SELECT count(*) FROM "._rectable($args{defrec}, $args{revrec}).
+        " WHERE "._recparent($args{defrec}, $args{revrec})." = ? AND type = 5 AND $hfield = ?",
+        undef, $args{id}, $hcheck);
+  if ($t[0] > 1) {
+    $errstr = "There is already a CNAME present for ".($revrec eq 'y' ? $arpaname : $hcheck).
+        ".  Only one CNAME may be present for a given name.";
+    return;
+  }
+
+#  } else {
+#    # Non-CNAME records will only collide with CNAMEs
+#    my @t = $dbh->selectrow_array("SELECT count(*) FROM "._rectable($args{defrec}, $args{revrec}).
+#       " WHERE "._recparent($args{defrec}, $args{revrec})." = ? AND type = 5 AND $hfield = ?",
+#       undef, $args{id}, $hcheck);
+#    return ('FAIL', "There is already a CNAME present for $hcheck.  Only one CNAME may be present for a given name.")
+#       if $t[0] > 1;
+#  }
+  return 1;
+
+} # _cname_collision()
+
 ## All of these subs take substantially the same arguments:
 # a hash containing at least the following keys:
@@ -808 +865 @@
       return ('FAIL', "The bare zone name may not be a CNAME") if ${$args{host}} eq $pname || ${$args{host}} =~ /^\@/;
 
-##enhance:  Look up the passed value to see if it exists.  Ooo, fancy.
+#      # Check for hostnames matching new name
+#      my @t = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = ? AND type <> ? AND host = ?",
+#       undef, $args{id}, 5, ${$args{host}});
+#      return ('FAIL', "One or more existing records already use ${$args{host}}.  CNAME records cannot use the same name as other records.")
+#       if $t[0] > 0;
+
       return ('FAIL', $errstr) if ! _check_hostname_form(${$args{val}}, ${$args{rectype}}, $args{defrec}, $args{revrec});
+
+my ($code,$msg) = self->_cname_collision(%args);
+
     } # $zname !~ .rpz
   } # revzone eq 'n'