Changeset 627

Timestamp:

04/29/14 18:03:44 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Update _validate_33() (SRV) for any-record-in-any-zone. See #53.

Also fix lurking bug in MX validation; MX-cannot-point-to-an-IP check was
checking the wrong record part for reverse records.

File:

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

trunk/DNSDB.pm

@@ -805 +805 @@
     # 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:]+)$/;
+      if ${$args{host}} =~ /^(?:[\d.]+|[0-9a-fA-F:]+)$/;
 
     # MX records in reverse zones get stricter treatment.  The UI bars adding them in
@@ -942 +942 @@
   return ('FAIL', 'Reverse zones cannot contain SRV records') if $args{revrec} eq 'y';
 
-  return ('FAIL', "Distance is required for SRV records") unless defined(${$args{dist}});
+  # Key additional record parts.  Always required.
+  return ('FAIL',"Distance, port and weight are required for SRV records")
+        unless defined(${$args{weight}}) && defined(${$args{port}}) && defined(${$args{dist}});
   ${$args{dist}} =~ s/\s*//g;
-  return ('FAIL',"Distance is required, and must be numeric") unless ${$args{dist}} =~ /^\d+$/;
-
-  # 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$/;
-
-  return ('FAIL',"SRV records must begin with _service._protocol [${$args{host}}]")
-        unless ${$args{host}} =~ /^_[A-Za-z]+\._[A-Za-z]+\.[a-zA-Z0-9-]+/;
-  return ('FAIL',"Port and weight are required for SRV records")
-        unless defined(${$args{weight}}) && defined(${$args{port}});
   ${$args{weight}} =~ s/\s*//g;
   ${$args{port}} =~ s/\s*//g;
-
-  return ('FAIL',"Port and weight are required, and must be numeric")
+  return ('FAIL',"Distance, port and weight are required, and must be numeric")
         unless ${$args{weight}} =~ /^\d+$/ && ${$args{port}} =~ /^\d+$/;
 
   ${$args{fields}} = "distance,weight,port,";
   push @{$args{vallist}}, (${$args{dist}}, ${$args{weight}}, ${$args{port}});
+
+  if ($args{revrec} eq 'n') {
+    # 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$/;
+
+    # Not strictly true, but SRV records not following this convention won't be found.
+    return ('FAIL',"SRV records must begin with _service._protocol [${$args{host}}]")
+        unless ${$args{host}} =~ /^_[A-Za-z]+\._[A-Za-z]+\.[a-zA-Z0-9-]+/;
+
+    # SRV target check - IP addresses not allowed.  Must be a more or less well-formed hostname.
+    return ('FAIL', "SRV records cannot point directly to an IP address")
+      if ${$args{val}} =~ /^(?:[\d.]+|[0-9a-fA-F:]+)$/;
+  } else {
+    # hm.  we can't do anything sane with IP values here;  part of the record data is in
+    # fact encoded in the "hostname".  enforce .arpa names?  OTOH, SRV records in a reverse
+    # zone are pretty silly.
+
+    # Not strictly true, but SRV records not following this convention won't be found.
+    return ('FAIL',"SRV records must begin with _service._protocol [${$args{host}}]")
+        unless ${$args{val}} =~ /^_[A-Za-z]+\._[A-Za-z]+\.[a-zA-Z0-9-]+/;
+
+    # SRV target check - IP addresses not allowed.  Must be a more or less well-formed hostname.
+    return ('FAIL', "SRV records cannot point directly to an IP address")
+      if ${$args{host}} =~ /^(?:[\d.]+|[0-9a-fA-F:]+)$/;
+
+    # SRV 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');