Attachment 143429 Details for Bug 31378 – Bug 31378: Add the API-based auth mechanism to C4::Auth::check_api_auth

[patch] Bug 31378: Add the API-based auth mechanism to C4::Auth::check_api_auth

Bug-31378-Add-the-API-based-auth-mechanism-to-C4Au.patch (text/plain), 3.27 KB, created by Martin Renvoize (ashimema) on 2022-11-08 15:24:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-11-08 15:24:14 UTC

Size: 3.27 KB

patch

obsolete

>From 29507ab2be940559195029daa6a7ae14bb9ade4c Mon Sep 17 00:00:00 2001
>From: Agustin Moyano <agustinmoyano@theke.io>
>Date: Tue, 23 Aug 2022 12:00:10 -0300
>Subject: [PATCH] Bug 31378: Add the API-based auth mechanism to
> C4::Auth::check_api_auth
>
>Signed-off-by: Lukasz Koszyk <lukasz.koszyk@kit.edu>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> C4/Auth.pm | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index 8bd13e88e1..ac73f2d018 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -259,9 +259,12 @@ sub get_template_and_user {
>                 -sameSite => 'Lax',
>             ));
> 
>+            my $auth_error = $in->{query}->param('auth_error');
>+
>             $template->param(
>                 loginprompt => 1,
>                 script_name => get_script_name(),
>+                auth_error  => $auth_error,
>             );
> 
>             print $in->{query}->header(
>@@ -1336,6 +1339,7 @@ sub checkauth {
>     $LibraryNameTitle =~ s/<(?:[^<>'"]|'(?:[^']*)'|"(?:[^"]*)")*>//sg;
> 
>     my $auth_template_name = ( $type eq 'opac' ) ? 'opac-auth.tt' : 'auth.tt';
>+    my $auth_error = $query->param('auth_error');
>     my $template = C4::Templates::gettemplate( $auth_template_name, $type, $query );
>     $template->param(
>         login                                 => 1,
>@@ -1373,6 +1377,7 @@ sub checkauth {
>         opac_css_override                     => $ENV{'OPAC_CSS_OVERRIDE'},
>         too_many_login_attempts               => ( $patron and $patron->account_locked ),
>         password_has_expired                  => ( $patron and $patron->password_expired ),
>+        auth_error                            => $auth_error,
>     );
> 
>     $template->param( SCO_login => 1 ) if ( $query->param('sco_user_login') );
>@@ -1556,6 +1561,7 @@ sub check_api_auth {
>         # new login
>         my $userid   = $query->param('userid');
>         my $password = $query->param('password');
>+        my $auth_client_login = $query->param('auth_client_login');
>         my ( $return, $cardnumber, $cas_ticket );
> 
>         # Proxy CAS auth
>@@ -1565,6 +1571,9 @@ sub check_api_auth {
>             # In case of a CAS authentication, we use the ticket instead of the password
>             my $PT = $query->param('PT');
>             ( $return, $cardnumber, $userid, $cas_ticket ) = check_api_auth_cas( $PT, $query );    # EXTERNAL AUTH
>+        } elsif ( $auth_client_login && ( $userid || $query->param('cardnumber') ) ) {
>+            $cardnumber = $query->param('cardnumber');
>+            $return = 1;
>         } else {
> 
>             # User / password auth
>@@ -1769,7 +1778,8 @@ sub check_cookie_auth {
>         } elsif ( $userid ) {
>             $session->param( 'lasttime', time() );
>             my $patron = Koha::Patrons->find({ userid => $userid });
>-            $patron = Koha::Patron->find({ cardnumber => $userid }) unless $patron;
>+            $patron = Koha::Patrons->find({ cardnumber => $userid })
>+              unless $patron;
>             return ("password_expired", undef ) if $patron->password_expired;
>             my $flags = defined($flagsrequired) ? haspermission( $userid, $flagsrequired ) : 1;
>             if ($flags) {
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 31378: 141362 | 141363 | 141364 | 141365 | 141366 | 141367 | 141368 | 141369 | 141370 | 141371 | 141372 | 141373 | 141374 | 141375 | 141376 | 141377 | 141378 | 141514 | 141771 | 141772 | 141773 | 141774 | 141775 | 141776 | 141777 | 141778 | 141779 | 141780 | 141781 | 141782 | 141783 | 141784 | 141785 | 141786 | 141787 | 141788 | 141801 | 141802 | 141803 | 141804 | 141805 | 141806 | 141807 | 141808 | 141809 | 141810 | 141811 | 141812 | 141813 | 141814 | 141815 | 141816 | 141817 | 141818 | 141853 | 143056 | 143087 | 143088 | 143089 | 143090 | 143091 | 143092 | 143093 | 143094 | 143095 | 143096 | 143097 | 143098 | 143099 | 143100 | 143101 | 143102 | 143103 | 143104 | 143105 | 143106 | 143107 | 143186 | 143187 | 143188 | 143189 | 143190 | 143191 | 143192 | 143193 | 143194 | 143195 | 143196 | 143197 | 143198 | 143199 | 143200 | 143202 | 143204 | 143205 | 143206 | 143207 | 143208 | 143215 | 143216 | 143217 | 143218 | 143219 | 143220 | 143221 | 143222 | 143223 | 143224 | 143225 | 143226 | 143227 | 143228 | 143229 | 143230 | 143231 | 143232 | 143233 | 143234 | 143235 | 143236 | 143266 | 143267 | 143268 | 143269 | 143270 | 143271 | 143272 | 143273 | 143274 | 143275 | 143277 | 143278 | 143279 | 143280 | 143281 | 143282 | 143283 | 143284 | 143285 | 143286 | 143287 | 143288 | 143396 | 143397 | 143398 | 143399 | 143400 | 143401 | 143402 | 143403 | 143404 | 143405 | 143406 | 143407 | 143408 | 143409 | 143410 | 143411 | 143412 | 143413 | 143414 | 143415 | 143416 | 143417 | 143418 | 143420 | 143421 | 143422 | 143423 | 143424 | 143425 | 143426 | 143427 | 143428 | 143429 | 143430 | 143431 | 143432 | 143433 | 143434 | 143435 | 143436 | 143437 | 143438 | 143439 | 143440 | 143441 | 143442 | 143443 | 143450 | 144071 | 144175