Changeset 417

Timestamp:

10/05/12 17:21:35 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix data integrity glitch; leading and trailing spaces were not
stripped from host and value. Only the value for TXT records will
be left alone - leading or trailing spaces could be legit there.

File:

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

trunk/DNSDB.pm

@@ -3457 +3457 @@
   $location  = '' if !$location;
 
+  # Spaces are evil.
+  $$host =~ s/^\s+//;
+  $$host =~ s/\s+$//;
+  if ($typemap{$$type} ne 'TXT') {
+    # Leading or trailng spaces could be legit in TXT records.
+    $$val =~ s/^\s+//;
+    $$val =~ s/\s+$//;
+  }
+
   # prep for validation
   my $addr = NetAddr::IP->new($$val);
@@ -3574 +3583 @@
   my $location = shift; # may be empty/null/undef depending on caller
   $location  = '' if !$location;
+
+  # Spaces are evil.
+  $$host =~ s/^\s+//;
+  $$host =~ s/\s+$//;
+  if ($typemap{$$type} ne 'TXT') {
+    # Leading or trailng spaces could be legit in TXT records.
+    $$val =~ s/^\s+//;
+    $$val =~ s/\s+$//;
+  }
 
   # prep for validation
@@ -4582 +4600 @@
         $ttl = '' if $ttl == '0';
 
+        # Spaces are evil.
+        $$host =~ s/^\s+//;
+        $$host =~ s/\s+$//;
+        if ($typemap{$$type} ne 'TXT') {
+          # Leading or trailng spaces could be legit in TXT records.
+          $$val =~ s/^\s+//;
+          $$val =~ s/\s+$//;
+        }
+
         _printrec_tiny($datafile, 'n', \%recflags,
                 $dom, $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp);