Changeset 938 for branches/cname-collision

Timestamp:

12/11/25 16:08:08 (24 hours ago)

Author:

Kris Deugau

Message:

/branches/cname-collision

Refine collision sub calling convention/arguments
Add preliminary call in A record validation
See #72.

File:

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

branches/cname-collision/DNSDB.pm

@@ -614 +614 @@
 # 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 $self = shift;
+  my $dbh = $self->{dbh};
+
+  my %args = @_;
+#my ($hcheck,$rectype,$zid,$defrec,$revrec) = @_;
+
+  my $hcheck = ($args{revrec} eq 'y' ? ${$args{val}} : ${$args{host}});
   my $hfield = ($args{revrec} eq 'y' ? 'val' : 'host');
 #my $hcheck = $hname;
@@ -626 +626 @@
   # $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') {
+  if ($args{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
@@ -641 +641 @@
         undef, $args{id}, $hcheck);
     if ($t[0] > 0) {
-      $errstr = "One or more non-CNAME records already exist for ".($revrec eq 'y' ? $arpaname : $hcheck).
+      $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.";
       return;
@@ -652 +652 @@
         undef, $args{id}, $hcheck);
   if ($t[0] > 1) {
-    $errstr = "There is already a CNAME present for ".($revrec eq 'y' ? $arpaname : $hcheck).
+    $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;
@@ -739 +739 @@
     return ('FAIL',"A record must be a valid IPv4 address")
         unless $args{addr} && !$args{addr}->{isv6};
+
+return ('FAIL', $errstr) unless $self->_cname_collision(%args);
+
     # coerce IP/value to normalized form for storage
     ${$args{val}} = $args{addr}->addr;