Changeset 611 for trunk/DNSDB.pm

Timestamp:

04/16/14 17:45:52 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Move call to _check_hostname_form() into the individual validator subs;
it's easier to call it from those on the appropriate part(s) of the
record as needed rather than always calling it on just one part, and
then having to reproduce the per-record behaviours in _check_hostname_form().

See #53.

File:

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

trunk/DNSDB.pm

@@ -504 +504 @@
 
     return ('FAIL', $errstr) if !$self->_inrev($args{val}, $revzone);
+
+    # ${$args{val}} is either a valid IP or a string ending with the .arpa zone name;
+    # now check if it's a well-formed FQDN
+    return ('FAIL', $errstr) if ! _check_hostname_form($args{val}, $$rectype, $defrec, $revrec)
+        if ${$args{val}} =~ /\.arpa$/;
 
     # Check IP is well-formed, and that it's a v4 address
@@ -3896 +3901 @@
   return ('FAIL', "TTL must be numeric") unless $ttl =~ /^-?\d+$/;
 
-  # Quick check on hostname parts.  There are enough variations to justify a sub now.
-  return ('FAIL', $errstr) if ! _check_hostname_form($$host, $$rectype, $defrec, $revrec);
-
   # Collect these even if we're only doing a simple A record so we can call *any* validation sub
   my $dist = shift;
@@ -4059 +4061 @@
   # do simple validation first
   return ('FAIL', "TTL must be numeric") unless $ttl =~ /^-?\d+$/;
-
-  # Quick check on hostname parts.  There are enough variations to justify a sub now.
-  return ('FAIL', $errstr) if ! _check_hostname_form($$host, $$rectype, $defrec, $revrec);
 
   # only MX and SRV will use these