Changeset 419 for branches/stable

Timestamp:

10/10/12 13:14:39 (12 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge no-spaces-in-host-or-value fix from r417 and r418. Note r417
seemed to bring in ~150 extra lines.
Bump patch version numbers.

Location:

branches/stable

Files:

• . (modified) (1 prop)
• DNSDB.pm (modified) (4 diffs)
• Makefile (modified) (1 diff)
• dns.cgi (modified) (1 diff)

branches/stable/DNSDB.pm

@@ -32 +32 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
-$VERSION        = 1.0.1;        ##VERSION##
+$VERSION        = 1.0.2;        ##VERSION##
 @ISA            = qw(Exporter);
 @EXPORT_OK      = qw(
@@ -1388 +1388 @@
   my $ttl = shift;
 
+  # Spaces are evil.
+  $host =~ s/^\s+//;
+  $host =~ s/\s+$//;
+  if ($typemap{$rectype} ne 'TXT') {
+    # Leading or trailng spaces could be legit in TXT records.
+    $val =~ s/^\s+//;
+    $val =~ s/\s+$//;
+  }
+
   # Validation
   my $addr = NetAddr::IP->new($val);
@@ -1471 +1480 @@
 
   return('FAIL',"Missing standard argument(s)") if !defined($ttl);
+
+  # 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+$//;
+  }
 
 # only MX and SRV will use these
@@ -1973 +1991 @@
 # of remaining data, allows up to 255 raw bytes
 
+        # 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+$//;
+        }
+
 ##fixme?  append . to all host/val hostnames
       if ($typemap{$type} eq 'SOA') {

branches/stable/Makefile

@@ -3 +3 @@
 
 PKGNAME=dnsadmin
-VERSION=1.0.1
+VERSION=1.0.2
 RELEASE=1
 

branches/stable/dns.cgi

@@ -609 +609 @@
     # prevent out-of-domain records from getting added by appending the domain, or DOMAIN for default records
     my $pname = ($webvar{defrec} eq 'y' ? 'DOMAIN' : domainName($dbh,$webvar{parentid}));
+    $webvar{name} =~ s/\s+$//;
     $webvar{name} =~ s/\.*$/\.$pname/ if $webvar{name} !~ /$pname$/;