Changeset 606 for trunk

Timestamp:

04/02/14 16:04:05 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit updates to A record validator to support (ab)use in reverse zones

File:

• trunk/DNSDB.pm (modified) (1 diff)

trunk/DNSDB.pm

@@ -449 +449 @@
   my %args = @_;
 
-  return ('FAIL', 'Reverse zones cannot contain A records') 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}} ne '@' && ${$args{host}} !~ /$pname$/);
-
-  # Check IP is well-formed, and that it's a v4 address
-  # Fail on "compact" IPv4 variants, because they are not consistent and predictable.
-  return ('FAIL',"$typemap{${$args{rectype}}} record must be a valid IPv4 address")
+# only for strict type restrictions
+#  return ('FAIL', 'Reverse zones cannot contain A records') if $args{revrec} eq 'y';
+
+  if ($args{revrec} eq 'y') {
+    # Get the revzone, so we can see if ${$args{val}} is in that zone
+    my $revzone = new NetAddr::IP $self->revName($args{id}, 'y');
+
+    # Unlike forward zones, we will not coerce the data into the reverse zone - an A record
+    # in a reverse zone is already silly enough without appending a mess of 1.2.3.in-addr.arpa
+    # (or worse, 1.2.3.4.5.6.7.8.ip6.arpa) on the end of the nominal "hostname".
+    # We're also going to allow the "hostname" to be stored as .arpa or IP, because it won't
+    # make any more sense either way.
+    if (${$args{val}} =~ /\.arpa$/) {
+      # "hostname" could be any syntactically legitimate string, but it must be within the formal
+      # .arpa zone.  Note we're not validating these for correct reverse-IP values.
+      # yes, we really need the v6 branch on the end here.
+      $revzone = _ZONE($revzone, 'ZONE', 'r', '.').($revzone->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
+      return ('FAIL', "${$args{val}} not within $revzone")
+        unless ${$args{val}} =~ /$revzone$/;
+    } else {
+      # "hostname" should be a valid IP address.  Normalize formatting if so.
+      return ('FAIL', "${$args{val}} is not a valid IP address") if !$args{addr};
+      return ('FAIL', "${$args{val}} is not within $revzone") if !$revzone->contains($args{addr});
+      (${$args{val}} = $args{addr}) =~ s{/(?:32|128)$}{};
+    }
+
+    # Check IP is well-formed, and that it's a v4 address
+    # Fail on "compact" IPv4 variants, because they are not consistent and predictable.
+    return ('FAIL',"A record must be a valid IPv4 address")
+        unless ${$args{host}} =~ /^\d+\.\d+\.\d+\.\d+$/;
+    $args{addr} = new NetAddr::IP ${$args{host}};
+    return ('FAIL',"A record must be a valid IPv4 address")
+        unless $args{addr} && !$args{addr}->{isv6};
+    # coerce IP/value to normalized form for storage
+    ${$args{host}} = $args{addr}->addr;
+
+    # I'm just going to ignore the utterly barmy idea of an A record in the *default*
+    # records for a reverse zone;  it's bad enough to find one in funky legacy data.
+
+  } else {
+    # revrec ne '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}} ne '@' && ${$args{host}} !~ /$pname$/);
+
+    # Check IP is well-formed, and that it's a v4 address
+    # Fail on "compact" IPv4 variants, because they are not consistent and predictable.
+    return ('FAIL',"A record must be a valid IPv4 address")
         unless ${$args{val}} =~ /^\d+\.\d+\.\d+\.\d+$/;
-  return ('FAIL',"$typemap{${$args{rectype}}} record must be a valid IPv4 address")
+    return ('FAIL',"A record must be a valid IPv4 address")
         unless $args{addr} && !$args{addr}->{isv6};
-  # coerce IP/value to normalized form for storage
-  ${$args{val}} = $args{addr}->addr;
+    # coerce IP/value to normalized form for storage
+    ${$args{val}} = $args{addr}->addr;
+  }
 
   return ('OK','OK');