gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 36598: Improve documentation and error message in CSRF plugin 

Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Julian Maurice 2024-05-13 15:06:04 +02:00 committed by Lucas Gass
parent d4a455425c
commit ec02f36f10
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Koha/App/Plugin/CSRF.pm
View File

@ -43,14 +43,18 @@ use Koha::Token;
Called by Mojolicious when the plugin is loaded.
Defines an `around_action` hook that will return a 403 response if CSRF token
is missing or invalid.
Defines an `around_action` hook that will prevent CSRF attacks.
This verification occurs only for HTTP methods POST, PUT, DELETE and PATCH.
If the HTTP request method is safe (GET, HEAD, OPTIONS, TRACE) and the request
contains an `op` parameter whose value starts with "cud-" (which means it's a
Create, Update or Delete operation), it will immediately return a 400 response.
If CGISESSID cookie is missing, it means that we are not authenticated or we
are authenticated to the API by another method (HTTP basic or OAuth2). In this
case, no verification is done.
If the HTTP request method is unsafe (POST, PUT, DELETE, PATCH, CONNECT) and
the CGISESSID cookie is set, the CSRF token is checked. A 403 response is
immediately returned if the CSRF token is missing or invalid.
If the CGISESSID cookie is missing, it means that we are not authenticated or
we are authenticated to the API by another method (HTTP basic or OAuth2). In
this case, no verification is done.
=cut
@ -65,7 +69,7 @@ sub register {
if ( $method eq 'GET' || $method eq 'HEAD' || $method eq 'OPTIONS' || $method eq 'TRACE' ) {
my $op = $c->req->param('op');
if ( $op && $op =~ /^cud-/ ) {
return $c->reply->exception('Wrong HTTP method')->rendered(400);
return $c->reply->exception('Incorrect use of a safe HTTP method with a "cud-" op parameter')->rendered(400);
}
} else {
if ( $c->cookie('CGISESSID') && !$self->is_csrf_valid( $c->req ) ) {

4
t/db_dependent/mojo/csrf.t
View File

@ -44,7 +44,7 @@ subtest 'CSRF - Intranet' => sub {
plan tests => 3;
$t->get_ok('/cgi-bin/koha/mainpage.pl?op=cud-login')->status_is(400)
->content_like( qr/Wrong HTTP method/, 'Body contains "Wrong HTTP method"' );
->content_like( qr/Incorrect use of a safe HTTP method with a/, 'Body contains correct error message' );
}
};
@ -85,6 +85,6 @@ subtest 'CSRF - OPAC' => sub {
plan tests => 3;
$t->get_ok('/cgi-bin/koha/opac-user.pl?op=cud-login')->status_is(400)
->content_like( qr/Wrong HTTP method/, 'Body contains "Wrong HTTP method"' );
->content_like( qr/Incorrect use of a safe HTTP method with a/, 'Body contains correct error message' );
}
};