From 87a607ef80f41e9b00bebb95800fec753f996456 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Tue, 22 Dec 2015 21:01:15 +0000 Subject: [PATCH] Revert "Bug 1230932 - Providing a condition as an ID to the webservice results in a taint error" This reverts commit 396ae88235ef68ed45978dfb36774c5fe9a2d699. --- Bugzilla/WebService/Bug.pm | 4 ---- Bugzilla/WebService/Constants.pm | 2 -- Bugzilla/WebService/Util.pm | 7 ------- template/en/default/global/code-error.html.tmpl | 7 ------- 4 files changed, 20 deletions(-) diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm index 92c81e5fdf..c996512010 100644 --- a/Bugzilla/WebService/Bug.pm +++ b/Bugzilla/WebService/Bug.pm @@ -1133,10 +1133,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 e32b9ad0f0..0bdd3517e4 100644 --- a/Bugzilla/WebService/Constants.pm +++ b/Bugzilla/WebService/Constants.pm @@ -67,8 +67,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 68b74c6971..7f3179154a 100644 --- a/Bugzilla/WebService/Util.pm +++ b/Bugzilla/WebService/Util.pm @@ -221,7 +221,6 @@ sub validate { # $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. @@ -230,12 +229,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 6dc49c6f15..d73d75e135 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -290,13 +290,6 @@ a [% param FILTER html %] argument, and that argument was not set. - [% ELSIF error == "param_integer_required" %] - The function [% function FILTER html %] requires - that [% param FILTER html %] be an integer. - - [% ELSIF error == "param_integer_array_required" %] - The [% param FILTER html %] parameter must be an array of integers. - [% ELSIF error == "params_required" %] [% title = "Missing Parameter" %] The function [% function FILTER html %] requires -- 2.47.2