Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1088253: GET REST calls should allow arbitrary URL parameters to be passed in addition the values in the path

Browse Source 
r=glob,a=glob


git-svn-id: svn://10.0.0.236/trunk@265651 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2014-10-29 19:00:54 +00:00
parent ef4c2fd12d
commit 15553be9c7
4 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
9193
9194

2
mozilla/webtools/bugzilla/.gitrev
View File

@ -1 +1 @@
9e0278d6debefbeaff7a219695d49ca0c789f150
38d2f3ab2c59f1ef9636990854fb9314dd8799d6

33
mozilla/webtools/bugzilla/Bugzilla/WebService/Server/REST.pm
View File

@ -337,11 +337,28 @@ sub _retrieve_json_params {
my $params = {};
%{$params} = %{ Bugzilla->input_params };
# First add any params we were able to pull out of the path
# based on the resource regexp
%{$params} = (%{$params}, %{$self->bz_rest_params}) if $self->bz_rest_params;
# First add any parameters we were able to pull out of the path
# based on the resource regexp and combine with the normal URL
# parameters.
if (my $rest_params = $self->bz_rest_params) {
foreach my $param (keys %$rest_params) {
if (!exists $params->{$param}) {
$params->{$param} = $rest_params->{$param};
next;
}
my @values = ref $rest_params->{$param}
? @{ $rest_params->{$param} }
: ($rest_params->{$param});
if (ref $params->{$param}) {
push(@{ $params->{$param} }, @values);
}
else {
$params->{$param} = [ $params->{$param}, @values ];
}
}
}
# Merge any additional query key/values with $obj->{params} if not a GET request
# Merge any additional query key/values from the request body if non-GET.
# We do this manually cause CGI.pm doesn't understand JSON strings.
if ($self->request->method ne 'GET') {
my $extra_params = {};
@ -352,14 +369,6 @@ sub _retrieve_json_params {
ThrowUserError('json_rpc_invalid_params', { err_msg => $@ });
}
}
# Allow parameters in the query string if request was not GET.
# Note: query string parameters will override any matching params
# also specified in the request body.
foreach my $param ($self->cgi->url_param()) {
$extra_params->{$param} = $self->cgi->url_param($param);
}
%{$params} = (%{$params}, %{$extra_params}) if %{$extra_params};
}

5
mozilla/webtools/bugzilla/Bugzilla/WebService/Server/REST/Resources/Bug.pm
View File

@ -29,6 +29,11 @@ sub _rest_resources {
status_code => STATUS_CREATED
}
},
qr{^/bug/$}, {
GET => {
method => 'get'
}
},
qr{^/bug/([^/]+)$}, {
GET => {
method => 'get',