Changeset 209

Timestamp:

12/19/11 17:58:57 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix up error reporting in addRec(); don't want to cause unintelligible
database errors where we can catch data-type mismatches before touching
the DB.

Location:

trunk

Files:

• DNSDB.pm (modified) (3 diffs)
• dns.cgi (modified) (2 diffs)

trunk/DNSDB.pm

@@ -1368 +1368 @@
   }
 
+  return ('FAIL', "TTL must be numeric") unless $ttl =~ /^\d+$/;
+
   my $fields = ($defrec eq 'y' ? 'group_id' : 'domain_id').",host,type,val,ttl";
   my $vallen = "?,?,?,?,?";
@@ -1375 +1377 @@
   if ($rectype == $reverse_typemap{MX} or $rectype == $reverse_typemap{SRV}) {
     $dist = shift;
-    return ('FAIL',"Need distance for $typemap{$rectype} record") if !defined($dist);
+    return ('FAIL',"Distance is required for $typemap{$rectype} records") unless defined($dist);
+    $dist =~ s/\s*//g;
+    return ('FAIL',"Distance is required, and must be numeric") unless $dist =~ /^\d+$/;
     $fields .= ",distance";
     $vallen .= ",?";
@@ -1386 +1390 @@
     # it just says (paraphrased) "... is prepended with _ to prevent DNS collisions"
     return ('FAIL',"SRV records must begin with _service._protocol [$host]")
-        if $host !~ /^_[A-Za-z]+\._[A-Za-z]+\.[a-zA-Z0-9-]+/;
+        unless $host =~ /^_[A-Za-z]+\._[A-Za-z]+\.[a-zA-Z0-9-]+/;
     $weight = shift;
     $port = shift;
-    return ('FAIL',"Need weight and port for SRV record") if !defined($weight) or !defined($port);
+    return ('FAIL',"Port and weight are required for SRV records") unless defined($weight) && defined($port);
+    $weight =~ s/\s*//g;
+    $port =~ s/\s*//g;
+    return ('FAIL',"Port and weight are required, and must be numeric")
+        unless $weight =~ /^\d+$/ && $port =~ /^\d+$/;
     $fields .= ",weight,port";
     $vallen .= ",?,?";

trunk/dns.cgi

@@ -535 +535 @@
       } else {
         my $restr = "Added record '$webvar{name} $typemap{$webvar{type}}";
-        $restr .= " [distance $webvar{dist}]" if $typemap{$webvar{type}} eq 'MX';
-        $restr .= " [priority $webvar{dist}] [weight $webvar{weight}] [port $webvar{port}]"
+        $restr .= " [distance $webvar{distance}]" if $typemap{$webvar{type}} eq 'MX';
+        $restr .= " [priority $webvar{distance}] [weight $webvar{weight}] [port $webvar{port}]"
                 if $typemap{$webvar{type}} eq 'SRV';
         $restr .= " $webvar{address}', TTL $webvar{ttl}";
@@ -552 +552 @@
       $page->param(id           => $webvar{id});
       fill_recdata();   # populate the form... er, mostly.
+      $page->param(name => $webvar{name});
       if ($config{log_failures}) {
         if ($webvar{defrec} eq 'y') {