Attachment 46859 Details for Bug 14310 – Bug 14310 [QA Followup] - Use output_with_http_headers, return 403s

[patch] Bug 14310 [QA Followup] - Use output_with_http_headers, return 403s

Bug-14310-QA-Followup---Use-outputwithhttpheaders-.patch (text/plain), 3.39 KB, created by Kyle M Hall (khall) on 2016-01-19 12:23:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2016-01-19 12:23:11 UTC

Size: 3.39 KB

patch

obsolete

>From 3d472cdc16c40711d4d654e8d78699da2c75a4f9 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Tue, 19 Jan 2016 11:07:48 +0000
>Subject: [PATCH] Bug 14310 [QA Followup] - Use output_with_http_headers,
> return 403s
>
>---
> svc/hold/resume  | 14 +++++++-------
> svc/hold/suspend | 14 ++++++++------
> 2 files changed, 15 insertions(+), 13 deletions(-)
>
>diff --git a/svc/hold/resume b/svc/hold/resume
>index 52f3508..ca7eec2 100755
>--- a/svc/hold/resume
>+++ b/svc/hold/resume
>@@ -23,6 +23,7 @@ use CGI;
> use JSON qw(to_json);
> 
> use C4::Context;
>+use C4::Output qw(output_with_http_headers);
> use C4::Auth qw(check_cookie_auth);
> use Koha::DateUtils qw(dt_from_string);
> use Koha::Holds;
>@@ -30,25 +31,24 @@ use Koha::Holds;
> my $input = new CGI;
> 
> my ( $auth_status, $sessionID ) =
>-  check_cookie_auth( $input->cookie('CGISESSID'),
>-    { circulate => 'circulate_remaining_permissions' } );
>+  check_cookie_auth( $input->cookie('CGISESSID'), { circulate => 'circulate_remaining_permissions' } );
> 
> if ( $auth_status ne "ok" ) {
>+    print $input->header(-type => 'text/plain', -status => '403 Forbidden');
>     exit 0;
> }
> 
>-binmode STDOUT, ":encoding(UTF-8)";
>-print $input->header( -type => 'text/json', -charset => 'UTF-8' );
>-
> my $reserve_id = $input->param('reserve_id');
> 
> my $hold = Koha::Holds->find( $reserve_id );
> 
> unless ( $hold ) {
>-    print to_json( { success => 0, error => "HOLD_NOT_FOUND" } );
>+    my $json = to_json( { success => 0, error => "HOLD_NOT_FOUND" } );
>+    output_with_http_headers( $input, undef, $json, "json" );
>     exit;
> }
> 
> $hold->resume();
> 
>-print to_json( { success => !$hold->suspend() } );
>+my $json = to_json( { success => !$hold->suspend() } );
>+output_with_http_headers( $input, undef, $json, "json" );
>diff --git a/svc/hold/suspend b/svc/hold/suspend
>index bd5382b..371debc 100755
>--- a/svc/hold/suspend
>+++ b/svc/hold/suspend
>@@ -23,6 +23,7 @@ use CGI;
> use JSON qw(to_json);
> 
> use C4::Context;
>+use C4::Output qw(output_with_http_headers);
> use C4::Auth qw(check_cookie_auth);
> use Koha::DateUtils qw(dt_from_string);
> use Koha::Holds;
>@@ -33,12 +34,10 @@ my ( $auth_status, $sessionID ) =
>   check_cookie_auth( $input->cookie('CGISESSID'), { circulate => 'circulate_remaining_permissions' } );
> 
> if ( $auth_status ne "ok" ) {
>+    print $input->header(-type => 'text/plain', -status => '403 Forbidden');
>     exit 0;
> }
> 
>-binmode STDOUT, ":encoding(UTF-8)";
>-print $input->header( -type => 'text/json', -charset => 'UTF-8' );
>-
> my $reserve_id = $input->param('reserve_id');
> 
> my $suspend_until = $input->param('suspend_until') || undef;
>@@ -46,17 +45,20 @@ if ($suspend_until) {
>     eval { $suspend_until = dt_from_string($suspend_until) };
> 
>     if ($@) {
>-        print to_json( { success => 0, error => 'INVALID_DATE' } );
>+        my $json = to_json( { success => 0, error => 'INVALID_DATE' } );
>+        output_with_http_headers( $input, undef, $json, "json" );
>         exit;
>     }
> }
> 
> my $hold = Koha::Holds->find($reserve_id);
> unless ($hold) {
>-    print to_json( { success => 0, error => 'HOLD_NOT_FOUND' } );
>+    my $json = to_json( { success => 0, error => 'HOLD_NOT_FOUND' } );
>+    output_with_http_headers( $input, undef, $json, "json" );
>     exit;
> }
> 
> $hold->suspend_hold($suspend_until);
> 
>-print to_json( { success => $hold->suspend() } );
>+my $json = to_json( { success => $hold->suspend() } );
>+output_with_http_headers( $input, undef, $json, "json" );
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 14310: 39750 | 39751 | 39752 | 39753 | 39754 | 40024 | 40030 | 40031 | 40034 | 43525 | 43526 | 43830 | 43831 | 43832 | 43978 | 44203 | 44204 | 44205 | 44206 | 44207 | 46857 | 46858 | 46859 | 46860 | 46861 | 46862 | 46870 | 46871 | 46872 | 46873 | 46874 | 46875 | 46876