Changeset 623

Timestamp:

04/29/14 16:16:33 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Update _validate_16() (TXT) for any-record-in-any-zone. See #53.

File:

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

trunk/DNSDB.pm

@@ -834 +834 @@
   my %args = @_;
 
-  if ($args{revrec} eq 'y') {
+  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$/;
+    return ('FAIL', $errstr) if ! _check_hostname_form(${$args{host}}, ${$args{rectype}}, $args{defrec}, $args{revrec});
+  } else {
+    # We don't coerce reverse "hostnames" into the zone, mainly because we store most sane
+    # records as IP values, not .arpa names.
+    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$/;
   }
 
@@ -847 +861 @@
 # RP record
 sub _validate_17 {
-  # Probably have to validate these some day
-  return ('OK','OK');
+  # Probably have to validate these separately some day.  Call _validate_16() above since
+  # they're otherwise very similar
+  return _validate_16(@_);
 } # done RP record