Attachment 170856 Details for Bug 37765 – Bug 37765: Fix forms that POST without an op in systemprefernces

[patch] Bug 37765: Fix forms that POST without an op in systemprefernces

Bug-37765-Fix-forms-that-POST-without-an-op-in-sys.patch (text/plain), 4.35 KB, created by Jonathan Druart on 2024-08-29 09:36:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2024-08-29 09:36:49 UTC

Size: 4.35 KB

patch

obsolete

>From 46e7f975ee2233d44513429ea7abadc1c016aec0 Mon Sep 17 00:00:00 2001
>From: Phil Ringnalda <phil@chetcolibrary.org>
>Date: Wed, 28 Aug 2024 19:57:52 -0700
>Subject: [PATCH] Bug 37765: Fix forms that POST without an op in
> systemprefernces
>
>We intend not to have forms with method="post" without an op variable (so we
>can check that the op starts with "cud-" as part of the CSRF protection), but
>because of bug 37728 some were missed.
>
>The two in systempreferences are the button to cancel deleting a local
>preference, which can be fixed with no visible change, and the button to
>return to the preferences list after being told that your requested deletion
>has been done, which makes a visible change because right now, the whole page
>that tells you the preference was deleted doesn't show at all.
>
>Test plan:
> 1. Without the patch, Administration - System preferences - Local use (in the
>    left sidebar)
> 2. New system preference - Explanation and Variable are required, so make
>    them both Trash and Save
> 3. In the row for your new preference, click the Delete button
> 4. In the confirmation page, click the No, do not delete button
> 5. You'll be taken back to the list of Local use preferences. That's the
>    behavior that you want to see unchanged after the patch
> 6. Click the Delete button for your preference again, but this time click
>    Yes, delete
> 7. You'll be taken to a blank page with no category of preferences selected
>    or listed. That's the behavior that you want to see change with the patch
> 8. Apply patch, restart_all
> 9. Administration - System preferences - Local use - New system preference -
>    'Trash' for both Explanation and Variable - Save
>10. In the row for the new preference, click the Delete button
>11. In the confirmation page, click No, do not delete
>12. Verify that it returns you to the list of Local use preferences just like
>    before
>13. Click Delete again, but this time click Yes, delete
>14. Now you should get a page saying "Data deleted" with a Back to system
>    preferences button. Click that button, you should return to the list
>    of Local use preferences, with your Trash preference gone
>
>Sponsored-by: Chetco Community Public Library
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> admin/systempreferences.pl                                  | 1 +
> .../prog/en/modules/admin/systempreferences.tt              | 6 ++----
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
>index 816714034d7..4561ba65786 100755
>--- a/admin/systempreferences.pl
>+++ b/admin/systempreferences.pl
>@@ -352,6 +352,7 @@ if ( $op eq 'add_form' ) {
> } elsif ( $op eq 'cud-delete_confirmed' ) {
>     output_and_exit_if_error($input, $cookie, $template, { check => 'csrf_token' });
>     C4::Context->delete_preference($searchfield);
>+    $template->param( delete_confirmed => 1 );
>     # END $OP eq DELETE_CONFIRMED
> ################## DEFAULT ##################################
> } else {    # DEFAULT
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>index 14efa176387..302c7e01480 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>@@ -289,8 +289,7 @@
>                 <input type="hidden" name="Tvalue" value="[% Tvalue | html %]" />
>                 <button type="submit" class="btn btn-default approve"><i class="fa fa-check" aria-hidden="true"></i> Yes, delete</button>
>             </form>
>-            <form class="inline" action="[% script_name | html %]" method="post">
>-                [% INCLUDE 'csrf-token.inc' %]
>+            <form class="inline" action="[% script_name | html %]" method="get">
>                 <button type="submit" class="btn btn-default deny"><i class="fa fa-remove" aria-hidden="true"></i> No, do not delete</button>
>             </form>
>         </div>
>@@ -299,8 +298,7 @@
>     [% IF ( delete_confirmed ) %]
>         <div class="alert alert-info">
>             <h1>Data deleted</h1>
>-            <form action="[% script_name | html %]" method="post">
>-                [% INCLUDE 'csrf-token.inc' %]
>+            <form action="[% script_name | html %]" method="get">
>                 <button type="submit">Back to system preferences</button>
>             </form>
>         </div>
>-- 
>2.34.1

Actions: View | Diff | Splinter Review

Attachments on bug 37765: 170853 | 170854 | 170856 | 171133