Changeset 768 for trunk

Timestamp:

08/16/17 12:57:11 (7 years ago)

Author:

Kris Deugau

Message:

/trunk

Tighten some validation of numeric fields

• TTL on all records
• Distance, weight, and port for SRV, including a blurb about which field may have a bad character pasted

File:

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

trunk/DNSDB.pm

@@ -983 +983 @@
   ${$args{weight}} =~ s/\s*//g;
   ${$args{port}} =~ s/\s*//g;
-  return ('FAIL',"Distance, port and weight are required, and must be numeric")
-        unless ${$args{weight}} =~ /^\d+$/ && ${$args{port}} =~ /^\d+$/;
+  my @ferr;
+  push @ferr, "distance" unless ${$args{dist}} =~ /^\d+$/;
+  push @ferr, "weight" unless ${$args{weight}} =~ /^\d+$/;
+  push @ferr, "port" unless ${$args{port}} =~ /^\d+$/;
+  return ('FAIL',"Distance, port and weight are required, and must be numeric (check ".join(",", @ferr).")")
+        unless ${$args{dist}} =~ /^\d+$/ && ${$args{weight}} =~ /^\d+$/ && ${$args{port}} =~ /^\d+$/;
 
   ${$args{fields}} = "distance,weight,port,";
@@ -4508 +4512 @@
 
   # do simple validation first
+  $ttl = '' if !$ttl;
+  $ttl =~ s/\s*//g;
   return ('FAIL', "TTL must be numeric") unless $ttl =~ /^-?\d+$/;
 
@@ -4658 +4664 @@
 
   # do simple validation first
+  $ttl = '' if !$ttl;
+  $ttl =~ s/\s*//g;
   return ('FAIL', "TTL must be numeric") unless $ttl =~ /^-?\d+$/;