Attachment 168586 Details for Bug 37018 – Bug 37018: Throw exception and render error

[patch] Bug 37018: Throw exception and render error

Bug-37018-Throw-exception-and-render-error.patch (text/plain), 2.00 KB, created by Tomás Cohen Arazi (tcohen) on 2024-07-08 11:57:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2024-07-08 11:57:16 UTC

Size: 2.00 KB

patch

obsolete

>From 63ec967c6568e5dde3f4e6b6cdb479dd359ea655 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 5 Jun 2024 15:58:06 +0100
>Subject: [PATCH] Bug 37018: Throw exception and render error
>
>For some reason this doesn't work :(. We still result in a 200, when I'd
>expect a 400 instead coming from the catch block.  It would be nice to
>use openapi too for the 400 render but I can't use that in the way the
>test is written.
>---
> Koha/REST/Plugin/Query.pm | 15 +++++++++++++--
> 1 file changed, 13 insertions(+), 2 deletions(-)
>
>diff --git a/Koha/REST/Plugin/Query.pm b/Koha/REST/Plugin/Query.pm
>index 39fbe62b4a9..a4160ac7d2e 100644
>--- a/Koha/REST/Plugin/Query.pm
>+++ b/Koha/REST/Plugin/Query.pm
>@@ -21,6 +21,7 @@ use Mojo::Base 'Mojolicious::Plugin';
> use List::MoreUtils qw( any );
> use Scalar::Util qw( reftype );
> use JSON qw( decode_json );
>+use Try::Tiny qw( catch try );
> 
> use Koha::Exceptions;
> 
>@@ -198,7 +199,16 @@ Validate operators in the passed query.
>     $app->helper(
>         'dbic_validate_operators' => sub {
>             my ( $c, $args ) = @_;
>-            _validate_query($args->{filtered_params});
>+            return try {
>+                _validate_query( $args->{filtered_params} );
>+            } catch {
>+                if ( blessed $_ && $_->isa('Koha::Exceptions::BadParameter') ) {
>+                    return $c->render(
>+                        status  => 400,
>+                        json => { error => $_->error }
>+                    );
>+                }
>+            };
>         }
>     );
> 
>@@ -663,7 +673,8 @@ sub _rewrite_related_metadata_query {
> sub _validate_operator {
>     my ($operator) = @_;
>     my %allowed_operators = map { $_ => 1 } qw(= != < > <= >= like -not_like -in -ident -bool -not_bool -or);
>-    die "Invalid operator: $operator" unless exists $allowed_operators{$operator};
>+    Koha::Exceptions::BadParameter->throw(
>+                "Invalid operator in query: $operator") unless exists $allowed_operators{$operator};
>     return;
> }
> 
>-- 
>2.45.2

Actions: View | Diff | Splinter Review

Attachments on bug 37018: 167440 | 167441 | 167442 | 167446 | 167447 | 167448 | 167449 | 167603 | 167672 | 167691 | 167772 | 168458 | 168582 | 168583 | 168584 | 168585 | 168586 | 168587 | 168616 | 168617 | 168618 | 168619 | 168620 | 168621 | 168622 | 168624 | 168626 | 168627 | 168628 | 168629 | 168630 | 168631 | 168632 | 168633 | 168634 | 168635 | 168654 | 168655 | 168656 | 168657 | 168658 | 168659 | 168660 | 168661 | 168662 | 168695 | 168696 | 168697 | 168698 | 168699 | 168700 | 168701 | 168702 | 168703 | 168704 | 168786 | 168787 | 168788 | 168789 | 168790 | 168791 | 168792 | 168793 | 168794 | 168795 | 169309 | 169337 | 169338 | 169339 | 169340 | 169341 | 169342 | 169343 | 169344 | 169345 | 169346 | 169368 | 169369 | 169370 | 169371 | 169372 | 169373 | 169374 | 169375 | 169376 | 169377 | 169378 | 169414 | 169832 | 169833 | 169834 | 169835 | 169836 | 169837 | 169838 | 169839 | 169840 | 169841