Changeset 630 for trunk

Timestamp:

04/30/14 17:18:23 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Add a bit more validation in _validate_65280() (A+PTR) Just In Case.
See #53.

A+PTR and AAAA+PTR can have stricter validation because they're logical
representations of pairs of matched records; if there's a mismatch then
they should automatically be coerced down to single A, AAAA, or PTR
records as appropriate.

File:

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

trunk/DNSDB.pm

@@ -1017 +1017 @@
     # live record;  revrec determines whether we validate the PTR or A component first.
 
+    # Fail early on non-IP gibberish in ${$args{val}}.  Arguably .arpa names might be acceptable
+    # but that gets stupid in forward zones, since these records are shared.
+    return ('FAIL', "$typemap{${$args{rectype}}} record must be a valid IPv4 address")
+      if ${$args{rectype}} == 65280 && ${$args{val}} !~ /^\d+\.\d+\.\d+\.\d+$/;
+    return ('FAIL', "$typemap{${$args{rectype}}} record must be a valid IPv6 address")
+      if ${$args{rectype}} == 65281 && ${$args{val}} !~ /^[a-fA-F0-9:]+$/;
+    # If things are not OK, this should prevent Stupid in the error log.
+    $args{addr} = new NetAddr::IP ${$args{val}}
+      or return ('FAIL', "$typemap{${$args{rectype}}} record must be a valid IPv".
+                        (${$args{rectype}} == 65280 ? '4' : '6')." address");
+    ${$args{val}} = $args{addr}->addr;
+
     if ($args{revrec} eq 'y') {
       ($code,$msg) = $self->_validate_12(%args);
@@ -1078 +1090 @@
       }
 
-#      my ($ptrcount) = $dbh->selectrow_array("SELECT count(*) FROM "._rectable($args{defrec},$args{revrec}).
-#       " WHERE val = ?", undef, ${$args{val}});
-#      if ($ptrcount) {
-#        my $curid = $dbh->selectrow_array("SELECT record_id FROM "._rectable($args{defrec},$args{revrec}).
-#               " WHERE val = ?
-#       $msg = "PTR record for ${$args{val}} already exists;  adding another will probably not do what you want";
-#       $code = 'WARN';
-#      }
-
+      # Add the reverse zone ID to the fieldlist
       ${$args{fields}} .= "rdns_id,";
       push @{$args{vallist}}, $revid;
@@ -1092 +1096 @@
 
   } else {      # defrec eq 'y'
+
     if ($args{revrec} eq 'y') {
       ($code,$msg) = $self->_validate_12(%args);