Changeset 233

Timestamp:

02/14/12 18:01:43 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint - special type validation for 65280 and 65281 should
be complete, but testing is behaving a bit strangely

File:

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

trunk/DNSDB.pm

@@ -469 +469 @@
   if ($args{defrec} eq 'n') {
     # live record;  revrec determines whether we validate the PTR or A component first.
+
     if ($args{revrec} eq 'y') {
       ($code,$msg) = _validate_12($dbh, %args);
@@ -491 +492 @@
       # Check if the requested reverse zone exists - note, an IP fragment won't
       # work here since we don't *know* which parent to put it in.
+      # ${$args{val}} has been validated as a valid IP by now, in one of the above calls.
       my ($revid) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet >> ?".
         " ORDER BY masklen(revnet) DESC", undef, (${$args{val}}));
@@ -513 +515 @@
     }
 
-  } else {
-    # defrec eq 'y'
+  } else {      # defrec eq 'y'
+    if ($args{revrec} eq 'y') {
+      ($code,$msg) = _validate_12($dbh, %args);
+      return ($code,$msg) if $code eq 'FAIL';
+      if (${$args{rectype}} == 65280) {
+        return ('FAIL',"A+PTR record must be a valid IPv4 address or fragment")
+                if ${$args{val}} =~ /:/;
+        ${$args{val}} =~ s/^ZONE,/ZONE./;       # Clean up after uncertain IP-fragment-type from _validate_12
+      } elsif (${$args{rectype}} == 65281) {
+        return ('FAIL',"AAAA+PTR record must be a valid IPv6 address or fragment")
+                if ${$args{val}} =~ /\./;
+        ${$args{val}} =~ s/^ZONE,/ZONE::/;      # Clean up after uncertain IP-fragment-type from _validate_12
+      }
+    } else {
+      # This is easy.  I also can't see a real use-case for A/AAAA+PTR in *all* forward
+      # domains, since you wouldn't be able to substitute both domain and reverse zone
+      # sanely, and you'd end up with guaranteed over-replicated PTR records that would
+      # confuse the hell out of pretty much anything that uses them.
+      return ('FAIL', "$typemap{${$args{rectype}}} records not allowed in default domains");
+    }
   }