summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lawrence <dkl@mozilla.com>2015-12-22 21:53:19 +0100
committerDavid Lawrence <dkl@mozilla.com>2015-12-22 21:53:19 +0100
commit8a1506c0ac3b9fa6539cc153eff0d291c645d1d5 (patch)
treed4f22925a8b9db01c41792d83a0bbf9450c78aee
parent1e7b4002794930fad702718714b5d1c291bf816c (diff)
downloadbugzilla-8a1506c0ac3b9fa6539cc153eff0d291c645d1d5.tar.gz
bugzilla-8a1506c0ac3b9fa6539cc153eff0d291c645d1d5.tar.xz
Revert "Bug 1234325 - Backport upstream bug 1230932 to bmo/4.2 to fix providing a condition as an ID to the webservice results in a taint error"
-rw-r--r--Bugzilla/WebService/Bug.pm4
-rw-r--r--Bugzilla/WebService/Constants.pm2
-rw-r--r--Bugzilla/WebService/Util.pm10
-rw-r--r--template/en/default/global/code-error.html.tmpl7
4 files changed, 1 insertions, 22 deletions
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 1437700ac..d7a1d8f9b 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -1273,10 +1273,6 @@ sub update_comment_tags {
{ function => 'Bug.update_comment_tags',
param => 'comment_id' });
- ThrowCodeError("param_integer_required", { function => 'Bug.update_comment_tags',
- param => 'comment_id' })
- unless $comment_id =~ /^[0-9]+$/;
-
my $comment = Bugzilla::Comment->new($comment_id)
|| return [];
$comment->bug->check_is_visible();
diff --git a/Bugzilla/WebService/Constants.pm b/Bugzilla/WebService/Constants.pm
index 0aa803cc8..758fdebde 100644
--- a/Bugzilla/WebService/Constants.pm
+++ b/Bugzilla/WebService/Constants.pm
@@ -76,8 +76,6 @@ use constant WS_ERROR_CODE => {
number_too_large => 54,
number_too_small => 55,
illegal_date => 56,
- param_integer_required => 57,
- param_integer_array_required => 58,
# Bug errors usually occupy the 100-200 range.
improper_bug_id_field_value => 100,
bug_id_does_not_exist => 101,
diff --git a/Bugzilla/WebService/Util.pm b/Bugzilla/WebService/Util.pm
index e4c3eda44..4280f28e6 100644
--- a/Bugzilla/WebService/Util.pm
+++ b/Bugzilla/WebService/Util.pm
@@ -29,7 +29,6 @@ use Bugzilla::WebService::Constants;
use Storable qw(dclone);
use URI::Escape qw(uri_unescape);
-use List::MoreUtils qw(all any);
use base qw(Exporter);
@@ -232,8 +231,7 @@ sub validate {
# sent any parameters at all, and we're getting @keys where
# $params should be.
return ($self, undef) if (defined $params and !ref $params);
-
- my @id_params = qw( ids comment_ids );
+
# If @keys is not empty then we convert any named
# parameters that have scalar values to arrayrefs
# that match.
@@ -242,12 +240,6 @@ sub validate {
$params->{$key} = ref $params->{$key}
? $params->{$key}
: [ $params->{$key} ];
-
- if (any { $key eq $_ } @id_params) {
- my $ids = $params->{$key};
- ThrowCodeError('param_integer_array_required', { param => $key })
- unless ref($ids) eq 'ARRAY' && all { /^[0-9]+$/ } @$ids;
- }
}
}
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 9a0d84866..c4ff7e73a 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -375,13 +375,6 @@
a <code>[% param FILTER html %]</code> argument, and that
argument was not set.
- [% ELSIF error == "param_integer_required" %]
- The function <code>[% function FILTER html %]</code> requires
- that <code>[% param FILTER html %]</code> be an integer.
-
- [% ELSIF error == "param_integer_array_required" %]
- The <code>[% param FILTER html %]</code> parameter must be an array of integers.
-
[% ELSIF error == "params_required" %]
[% title = "Missing Parameter" %]
The function <code>[% function FILTER html %]</code> requires