Changeset 610

Timestamp:

04/16/14 13:11:14 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Move a bunch of common code from _validate_1() into its own sub, since
we'll need to call it for any record that doesn't "belong" in a reverse
zone. And possibly the ones that do, too. See #53.

File:

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

trunk/DNSDB.pm

@@ -383 +383 @@
 }
 
+## DNSDB::_inrev()
+# Check if a given "hostname" is within a given reverse zone
+# Takes a reference to the "hostname" and the reverse zone CIDR as a NetAddr::IP
+# Returns true/false.  Sets $errstr on errors.
+sub _inrev {
+  my $self = shift;
+  my $dbh = $self->{dbh};
+  # References, since we might munge them
+  my $fq = shift;
+  my $zone = shift;
+
+  # set default error
+  $errstr = "$$fq not within $zone";
+
+  # 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 of
+  # non-IP FQDNs in .arpa
+  if ($$fq =~ /\.arpa$/) {
+    # "FQDN" 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.
+    $zone = _ZONE($zone, 'ZONE', 'r', '.').($zone->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
+    return unless $$fq =~ /$zone$/;
+  } else {
+    # in most cases we should be getting a real IP as the "FQDN" to test
+    my $addr = new NetAddr::IP $$fq if _maybeip($fq);
+
+    # "FQDN" should be a valid IP address.  Normalize formatting if so.
+    if (!$addr) {
+      $errstr = "$$fq is not a valid IP address";
+      return;
+    }
+    return if !$zone->contains($addr);
+    ($$fq = $addr) =~ s{/(?:32|128)$}{};
+  }
+  return 1;
+} # end _inrev()
+
 ## DNSDB::_hostparent()
 # A little different than _ipparent above;  this tries to *find* the parent zone of a hostname
@@ -463 +503 @@
     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)$}{};
-    }
+    return ('FAIL', $errstr) if !$self->_inrev($args{val}, $revzone);
 
     # Check IP is well-formed, and that it's a v4 address