Bug 279303: Negative numbers are rejected as invalid sortkeys for milestones - Patch...

diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 0328c4f8686800b8ef85999df4cf7dfd76161094..926b92fceeb050252ed1259a03aeba7116395496 100644 (file)
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -29,6 +29,7 @@ use strict;
 
 use base qw(Exporter);
 @Bugzilla::Util::EXPORT = qw(is_tainted trick_taint detaint_natural
+                             detaint_signed
                              html_quote url_quote value_quote xml_quote
                              css_class_quote
                              lsearch max min
@@ -60,6 +61,16 @@ sub detaint_natural {
     return (defined($_[0]));
 }
 
+sub detaint_signed {
+    $_[0] =~ /^([-+]?\d+)$/;
+    $_[0] = $1;
+    # Remove any leading plus sign.
+    if (defined($_[0]) && $_[0] =~ /^\+(\d+)$/) {
+        $_[0] = $1;
+    }
+    return (defined($_[0]));
+}
+
 sub html_quote {
     my ($var) = (@_);
     $var =~ s/\&/\&/g;
@@ -196,6 +207,7 @@ Bugzilla::Util - Generic utility functions for bugzilla
   $rv = is_tainted($var);
   trick_taint($var);
   detaint_natural($var);
+  detaint_signed($var);
 
   # Functions for quoting
   html_quote($var);
@@ -256,6 +268,12 @@ This routine detaints a natural number. It returns a true value if the
 value passed in was a valid natural number, else it returns false. You
 B<MUST> check the result of this routine to avoid security holes.
 
+=item C<detaint_signed($num)>
+
+This routine detaints a signed integer. It returns a true value if the
+value passed in was a valid signed integer, else it returns false. You
+B<MUST> check the result of this routine to avoid security holes.
+
 =back
 
 =head2 Quoting

diff --git a/docs/xml/administration.xml b/docs/xml/administration.xml
index f0ccf027e9a8734a3da885d2de1693fdb0206654..e8d70a102827fbb4cf615939f7f92534e4442ecf 100644 (file)
--- a/docs/xml/administration.xml
+++ b/docs/xml/administration.xml
@@ -672,7 +672,7 @@
       <listitem>
         <para>Enter the name of the Milestone in the "Milestone" field. You
         can optionally set the "sortkey", which is a positive or negative
-        number (-255 to 255) that defines where in the list this particular
+        number (-32768 to 32767) that defines where in the list this particular
         milestone appears. This is because milestones often do not 
         occur in alphanumeric order For example, "Future" might be
         after "Release 1.2". Select "Add".</para>

diff --git a/editmilestones.cgi b/editmilestones.cgi
index aaec24455eff8e487373b128ddb64157681b242c..dce5e291d3eda1e76b7476f1adc9f4330baa150f 100755 (executable)
--- a/editmilestones.cgi
+++ b/editmilestones.cgi
@@ -87,6 +87,21 @@ sub CheckMilestone ($$)
     }
 }
 
+sub CheckSortkey ($$)
+{
+    my ($milestone,$sortkey) = @_;
+
+    if (!detaint_signed($sortkey) || $sortkey < -32768 || $sortkey > 32767) {
+        print "The sortkey for a milestone must be a number between -32768 ";
+        print "and 32767 inclusive.  Please press\n";
+        print "<b>Back</b> and try again.\n";
+        PutTrailer();
+        exit;
+    }
+
+    return $sortkey;
+}
+
 
 #
 # Displays the form to edit a milestone
@@ -295,12 +310,9 @@ if ($action eq 'new') {
         PutTrailer($localtrailer);
         exit;
     }
-    if (!detaint_natural($sortkey)) {
-        print "The sortkey for a milestone must be a number. Please press\n";
-        print "<b>Back</b> and try again.\n";
-        PutTrailer($localtrailer);
-        exit;
-    }
+
+    $sortkey = CheckSortkey($milestone,$sortkey);
+
     if (TestMilestone($product,$milestone)) {
         print "The milestone '$milestone' already exists. Please press\n";
         print "<b>Back</b> and try again.\n";
@@ -518,13 +530,8 @@ if ($action eq 'update') {
                          milestones WRITE,
                          products WRITE");
 
-    if ($sortkey != $sortkeyold) {
-        if (!detaint_natural($sortkey)) {
-            print "The sortkey for a milestone must be a number. Please press\n";
-            print "<b>Back</b> and try again.\n";
-            PutTrailer($localtrailer);
-            exit;
-        }
+    if ($sortkey ne $sortkeyold) {
+        $sortkey = CheckSortkey($milestone,$sortkey);
         SendSQL("UPDATE milestones SET sortkey=$sortkey
                  WHERE product_id=" . $product_id . "
                    AND value=" . SqlQuote($milestoneold));