From 2cbe2bd17316ebb3e57e3da424e8dc8c83f25592 Mon Sep 17 00:00:00 2001 From: Lari Taskula Date: Wed, 18 Sep 2024 11:21:30 +0000 Subject: [PATCH] Bug 28907: REST - Remove allow-owner from public article requests cancel route To test: 1. prove t/db_dependent/api/v1/article_requests.t 2. Apply patch 3. prove t/db_dependent/api/v1/article_requests.t Observe success in both cases. Signed-off-by: Victor Grousset/tuxayo --- Koha/REST/V1/ArticleRequests.pm | 25 +++++++++++----------- api/v1/swagger/paths/article_requests.yaml | 2 -- t/db_dependent/api/v1/article_requests.t | 8 +++++-- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Koha/REST/V1/ArticleRequests.pm b/Koha/REST/V1/ArticleRequests.pm index 9bc0c5a58b..64645790da 100644 --- a/Koha/REST/V1/ArticleRequests.pm +++ b/Koha/REST/V1/ArticleRequests.pm @@ -73,22 +73,23 @@ Controller function that handles cancelling a patron's Koha::ArticleRequest obje sub patron_cancel { my $c = shift->openapi->valid_input or return; - my $patron = Koha::Patrons->find( $c->param('patron_id') ); + my $patron_id = $c->param('patron_id'); + return try { + $c->auth->public($patron_id); + my $patron = Koha::Patrons->find($patron_id); - return $c->render_resource_not_found("Patron") - unless $patron; + return $c->render_resource_not_found("Patron") + unless $patron; - # patron_id has been validated by the allow-owner check, so the following call to related - # article requests covers the case of article requests not belonging to the patron - my $article_request = $patron->article_requests->find( $c->param('article_request_id') ); + # patron_id has been validated by the $c->auth->public check, so the following call to related + # article requests covers the case of article requests not belonging to the patron + my $article_request = $patron->article_requests->find( $c->param('article_request_id') ); - return $c->render_resource_not_found("Article request") - unless $article_request; + return $c->render_resource_not_found("Article request") + unless $article_request; - my $reason = $c->param('cancellation_reason'); - my $notes = $c->param('notes'); - - return try { + my $reason = $c->param('cancellation_reason'); + my $notes = $c->param('notes'); $article_request->cancel( { diff --git a/api/v1/swagger/paths/article_requests.yaml b/api/v1/swagger/paths/article_requests.yaml index d0fc698557..d3413243f1 100644 --- a/api/v1/swagger/paths/article_requests.yaml +++ b/api/v1/swagger/paths/article_requests.yaml @@ -113,5 +113,3 @@ description: Under maintenance schema: $ref: "../swagger.yaml#/definitions/error" - x-koha-authorization: - allow-owner: true diff --git a/t/db_dependent/api/v1/article_requests.t b/t/db_dependent/api/v1/article_requests.t index 6e43ffd625..f32e96adb3 100755 --- a/t/db_dependent/api/v1/article_requests.t +++ b/t/db_dependent/api/v1/article_requests.t @@ -84,7 +84,7 @@ subtest 'cancel() tests' => sub { subtest 'patron_cancel() tests' => sub { - plan tests => 14; + plan tests => 17; t::lib::Mocks::mock_preference( 'RESTPublicAPI', 1 ); t::lib::Mocks::mock_preference( 'RESTBasicAuth', 1 ); @@ -116,10 +116,14 @@ subtest 'patron_cancel() tests' => sub { my $article_request_2 = $builder->build_object({ class => 'Koha::ArticleRequests', value => { borrowernumber => $another_patron_id } }); + # delete another patron's request when unauthorized + $t->delete_ok( "/api/v1/public/patrons/$another_patron_id/article_requests/" . $article_request_2->id ) + ->status_is(401)->json_is( '/error' => "Authentication failure." ); + # delete another patron's request $t->delete_ok("//$userid:$password@/api/v1/public/patrons/$another_patron_id/article_requests/" . $article_request_2->id) ->status_is(403) - ->json_is( '/error' => 'Authorization failure. Missing required permission(s).' ); + ->json_is( '/error' => "Unprivileged user cannot access another user's resources" ); my $another_article_request = $builder->build_object( { -- 2.46.2