Changeset 622

Timestamp:

04/29/14 14:39:05 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit update to MX record validation for any-record-in-any-zone.
See #53.

File:

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

trunk/DNSDB.pm

@@ -782 +782 @@
   my %args = @_;
 
-# Not absolutely true but WTF use is an MX record for a reverse zone?
-  return ('FAIL', 'Reverse zones cannot contain MX records') if $args{revrec} eq 'y';
+# only for strict type restrictions
+#  return ('FAIL', 'Reverse zones cannot contain MX records') if $args{revrec} eq 'y';
 
   return ('FAIL', "Distance is required for MX records") unless defined(${$args{dist}});
@@ -792 +792 @@
   push @{$args{vallist}}, ${$args{dist}};
 
-  # Coerce all hostnames to end in ".DOMAIN" for group/default records,
-  # or the intended parent domain for live records.
-  my $pname = ($args{defrec} eq 'y' ? 'DOMAIN' : $self->domainName($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;
-#    }
-#  }
+  if ($args{revrec} eq 'n') {
+    # MX target check - IP addresses not allowed.  Must be a more or less well-formed hostname.
+    return ('FAIL', "MX records cannot point directly to an IP address")
+      if ${$args{val}} =~ /^(?:[\d.]+|[0-9a-fA-F:]+)$/;
+
+    # Coerce all hostnames to end in ".DOMAIN" for group/default records,
+    # or the intended parent domain for live records.
+    my $pname = ($args{defrec} eq 'y' ? 'DOMAIN' : $self->domainName($args{id}));
+    ${$args{host}} =~ s/\.*$/\.$pname/ if ${$args{host}} !~ /$pname$/;
+  } else {
+    # MX target check - IP addresses not allowed.  Must be a more or less well-formed hostname.
+    return ('FAIL', "MX records cannot point directly to an IP address")
+      if ${$args{val}} =~ /^(?:[\d.]+|[0-9a-fA-F:]+)$/;
+
+    # MX records in reverse zones get stricter treatment.  The UI bars adding them in
+    # reverse record sets, but we "need" to allow editing existing ones.  And we'll allow
+    # editing them if some loon manually munges one into a default reverse record set.
+    if ($args{defrec} eq 'n') {
+      # Get the revzone, so we can see if ${$args{val}} is in that zone
+      my $revzone = new NetAddr::IP $self->revName($args{id}, 'y');
+      return ('FAIL', $errstr) if !$self->_inrev($args{val}, $revzone);
+    }
+
+##enhance or ##fixme
+# convert well-formed .arpa names to IP addresses to match old "strict" validation design
+    return ('FAIL', $errstr) if ! _check_hostname_form(${$args{val}}, ${$args{rectype}}, $args{defrec}, $args{revrec}) &&
+      ${$args{val}} =~ /\.arpa$/;
+
+##enhance:  Look up the passed value to see if it exists.  Ooo, fancy.
+    return ('FAIL', $errstr) if ! _check_hostname_form(${$args{host}}, ${$args{rectype}}, $args{defrec}, $args{revrec});
+
+  }
 
   return ('OK','OK');