Changeset 509 for trunk

Timestamp:

05/09/13 18:05:52 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Add fences around curgroup and childlist arguments in several get*List
methods to prevent SQL injection. Unlike the sortorder and sortby
updates in r508, curgroup has no fallback, and arguably childlist has
no reasonable one, so the methods fail outright instead of continuing.

File:

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

trunk/DNSDB.pm

@@ -2225 +2225 @@
   my %args = @_;
 
+  # Fail on bad curgroup argument.  There's no sane fallback on this one.
+  if (!$args{curgroup} || $args{curgroup} !~ /^\d+$/) {
+    $errstr = "Bad or missing curgroup argument";
+    return;
+  }
+  # Fail on bad childlist argument.  This could be sanely ignored if bad, maybe.
+  if ($args{childlist} && $args{childlist} !~ /^[\d,]+$/) {
+    $errstr = "Bad childlist argument";
+    return;
+  }
+
   my @filterargs;
   $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
@@ -2263 +2274 @@
   $args{sortorder} = 'ASC' if !$args{sortorder} || !grep /^$args{sortorder}$/, ('ASC','DESC');
   $args{offset} = 0 if !$args{offset} || $args{offset} !~ /^(?:all|\d+)$/;
+
+  # Fail on bad curgroup argument.  There's no sane fallback on this one.
+  if (!$args{curgroup} || $args{curgroup} !~ /^\d+$/) {
+    $errstr = "Bad or missing curgroup argument";
+    return;
+  }
+  # Fail on bad childlist argument.  This could be sanely ignored if bad, maybe.
+  if ($args{childlist} && $args{childlist} !~ /^[\d,]+$/) {
+    $errstr = "Bad childlist argument";
+    return;
+  }
 
   my @filterargs;
@@ -2558 +2580 @@
   my %args = @_;
 
+  # Fail on bad curgroup argument.  There's no sane fallback on this one.
+  if (!$args{curgroup} || $args{curgroup} !~ /^\d+$/) {
+    $errstr = "Bad or missing curgroup argument";
+    return;
+  }
+  # Fail on bad childlist argument.  This could be sanely ignored if bad, maybe.
+  if ($args{childlist} && $args{childlist} !~ /^[\d,]+$/) {
+    $errstr = "Bad childlist argument";
+    return;
+  }
+
   my @filterargs;
-
   $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
   push @filterargs, "^$args{startwith}" if $args{startwith};
@@ -2584 +2616 @@
   my %args = @_;
 
+  # Fail on bad curgroup argument.  There's no sane fallback on this one.
+  if (!$args{curgroup} || $args{curgroup} !~ /^\d+$/) {
+    $errstr = "Bad or missing curgroup argument";
+    return;
+  }
+  # Fail on bad childlist argument.  This could be sanely ignored if bad, maybe.
+  if ($args{childlist} && $args{childlist} !~ /^[\d,]+$/) {
+    $errstr = "Bad childlist argument";
+    return;
+  }
+
   my @filterargs;
-
   $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
   push @filterargs, "^$args{startwith}" if $args{startwith};
@@ -2786 +2828 @@
   my %args = @_;
 
+  # Fail on bad curgroup argument.  There's no sane fallback on this one.
+  if (!$args{curgroup} || $args{curgroup} !~ /^\d+$/) {
+    $errstr = "Bad or missing curgroup argument";
+    return;
+  }
+  # Fail on bad childlist argument.  This could be sanely ignored if bad, maybe.
+  if ($args{childlist} && $args{childlist} !~ /^[\d,]+$/) {
+    $errstr = "Bad childlist argument";
+    return;
+  }
+
   my @filterargs;
-
   $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
   push @filterargs, "^$args{startwith}" if $args{startwith};
   push @filterargs, $args{filter} if $args{filter};
-
 
   my $sql = "SELECT count(*) FROM users ".
@@ -2815 +2866 @@
   my %args = @_;
 
+  # Fail on bad curgroup argument.  There's no sane fallback on this one.
+  if (!$args{curgroup} || $args{curgroup} !~ /^\d+$/) {
+    $errstr = "Bad or missing curgroup argument";
+    return;
+  }
+  # Fail on bad childlist argument.  This could be sanely ignored if bad, maybe.
+  if ($args{childlist} && $args{childlist} !~ /^[\d,]+$/) {
+    $errstr = "Bad childlist argument";
+    return;
+  }
+
   my @filterargs;
-
   $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
   push @filterargs, "^$args{startwith}" if $args{startwith};
@@ -3258 +3319 @@
   my %args = @_;
 
+  # Fail on bad curgroup argument.  There's no sane fallback on this one.
+  if (!$args{curgroup} || $args{curgroup} !~ /^\d+$/) {
+    $errstr = "Bad or missing curgroup argument";
+    return;
+  }
+  # Fail on bad childlist argument.  This could be sanely ignored if bad, maybe.
+  if ($args{childlist} && $args{childlist} !~ /^[\d,]+$/) {
+    $errstr = "Bad childlist argument";
+    return;
+  }
+
   my @filterargs;
-
   $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
   push @filterargs, "^$args{startwith}" if $args{startwith};
   push @filterargs, $args{filter} if $args{filter};
-
 
   my $sql = "SELECT count(*) FROM locations ".
@@ -3282 +3352 @@
   my %args = @_;
 
+  # Fail on bad curgroup argument.  There's no sane fallback on this one.
+  if (!$args{curgroup} || $args{curgroup} !~ /^\d+$/) {
+    $errstr = "Bad or missing curgroup argument";
+    return;
+  }
+  # Fail on bad childlist argument.  This could be sanely ignored if bad, maybe.
+  if ($args{childlist} && $args{childlist} !~ /^[\d,]+$/) {
+    $errstr = "Bad childlist argument";
+    return;
+  }
+
   my @filterargs;
-
   $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
   push @filterargs, "^$args{startwith}" if $args{startwith};