Changeset 160 for trunk/DNSDB.pm

Timestamp:

11/02/11 18:12:35 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Use bind parameters in DNSDB::getDomRecs for filter
Make sure A records get an IPv4 address, and AAAA records get

a v6 address in DNSDB::addRec

Normalize and clean up handling for filtering and starts-with

• common ops now done along with the rest of the global ops
• filtering arguments now pushed into a global
• use bind parameters in SQL (this should transfer OK to subs in DNSDB.pm later)

Add a couple new ##fixme's for scope checks
Force appending of domain or DOMAIN on record or default record

respectively, if they don't already have that at the end

Retrieve "old" info for logging record changes
Remove some stale commented fragments and ##fixme's

File:

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

trunk/DNSDB.pm

@@ -1212 +1212 @@
 
   my $filter = shift || '';
-  # keep the nasties down, since we can't ?-sub this bit.  :/
-  # note this is chars allowed in DNS hostnames
-  $filter =~ s/[^a-zA-Z0-9_.:-]//g;
 
   $type = 'y' if $type eq 'def';
@@ -1228 +1225 @@
   }
   $sql .= " AND NOT r.type=$reverse_typemap{SOA}";
-  $sql .= " AND host ILIKE '%$filter%'" if $filter;
+  $sql .= " AND host ~* ?" if $filter;
   # use alphaorder column for "correct" ordering of sort-by-type instead of DNS RR type number
   $sql .= " ORDER BY ".($order eq 'type' ? 't.alphaorder' : "r.$order")." $direction";
@@ -1291 +1288 @@
 
   # Validation
+  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}$/;
+  }
+  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