Changeset 223 for trunk

Timestamp:

01/20/12 16:28:10 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Add some data validation on A/AAAA record update; tweak the validation
on A/AAAA record add to match
Add commented possible check for A/AAAA IP validation in NS, MX, and
SRV records for future pondering

File:

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

trunk/DNSDB.pm

@@ -1379 +1379 @@
 
   # Validation
+  my $addr = NetAddr::IP->new($val);
   if ($rectype == $reverse_typemap{A}) {
-    return ("FAIL", "IPv4 addresses must be in the format n.n.n.n")
-        unless $val =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/;
+    return ('FAIL',$typemap{$rectype}." record must be a valid IPv4 address")
+        unless $addr && !$addr->{isv6};
   }
   if ($rectype == $reverse_typemap{AAAA}) {
-    return ("FAIL", "IPv6 addresses must be in the format h:h:h::h")
-        unless $val =~ /^[a-fA-F0-9:]+$/
-  }
-  if ($rectype == $reverse_typemap{A} or $rectype == $reverse_typemap{AAAA}) {
-    my $tmpip = new NetAddr::IP $val or
-        return ("FAIL", "Address must be a valid IP address");
+    return ('FAIL',$typemap{$rectype}." record must be a valid IPv6 address")
+        unless $addr && $addr->{isv6};
   }
 
@@ -1472 +1469 @@
   if ($type == $reverse_typemap{MX} || $type == $reverse_typemap{SRV}) {
     $dist = shift;
+    $dist =~ s/\s+//g;
     return ('FAIL',"MX or SRV requires distance") if !defined($dist);
+    return ('FAIL', "Distance must be numeric") unless $dist =~ /^\d+$/;
     if ($type == $reverse_typemap{SRV}) {
       $weight = shift;
+      $weight =~ s/\s+//g;
       return ('FAIL',"SRV requires weight") if !defined($weight);
+      return ('FAIL',"Weight must be numeric") unless $weight =~ /^\d+$/;
       $port = shift;
+      $port =~ s/\s+//g;
       return ('FAIL',"SRV requires port") if !defined($port);
+      return ('FAIL',"Port must be numeric") unless $port =~ /^\d+$/;
     }
   }
+
+# Enforce IP addresses on A and AAAA types
+  my $addr = NetAddr::IP->new($val);
+  if ($type == $reverse_typemap{A}) {
+    return ('FAIL',$typemap{$type}." record must be a valid IPv4 address")
+        unless $addr && !$addr->{isv6};
+  }
+  if ($type == $reverse_typemap{AAAA}) {
+    return ('FAIL',$typemap{$type}." record must be a valid IPv6 address")
+        unless $addr && $addr->{isv6};
+  }
+
+# hmm..  this might work.  except possibly for something pointing to "deadbeef.ca".  <g>
+#  if ($type == $reverse_typemap{NS} || $type == $reverse_typemap{MX} || $type == $reverse_typemap{SRV}) {
+#    if ($val =~ /^\s*[\da-f:.]+\s*$/) {
+#      return ('FAIL',"$val is not a valid IP address") if !$addr;
+#    }
+#  }
 
   local $dbh->{AutoCommit} = 0;