Changeset 586 for trunk

Timestamp:

01/17/14 10:34:43 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix subtle validation bug on TXT and SRV records.

SRV records would fail if entered as "_service._protocol" without the
domain. Move the domain coercion up above the check for _service._protocol
so its regex has a domain to chew on.

TXT records did not have any domain-part validation; you could end up
with bare-hostname TXT records instead of the correct hostname.domain
records. This only affects forward zones since TXT in reverse zones are
attached to an IP, which is validated as such elsewhere.

File:

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

trunk/DNSDB.pm

@@ -648 +648 @@
 # TXT record
 sub _validate_16 {
+  my $self = shift;
+
+  my %args = @_;
+
+  if ($args{revrec} eq 'y') {
+    # 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$/;
+  }
+
   # Could arguably put a WARN return here on very long (>512) records
   return ('OK','OK');
@@ -694 +705 @@
   ${$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}}]")
@@ -707 +723 @@
   ${$args{fields}} = "distance,weight,port,";
   push @{$args{vallist}}, (${$args{dist}}, ${$args{weight}}, ${$args{port}});
-
-  # 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 ('OK','OK');