Bugzilla – Attachment 162156 Details for
Bug 35918
Incorrect library used when AutoLocation configured using the same IP
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35918: Fix auto library connect (AutoLocation)
Bug-35918-Fix-auto-library-connect-AutoLocation.patch (text/plain), 3.32 KB, created by
Kyle M Hall (khall)
on 2024-02-14 16:34:28 UTC
(
hide
)
Description:
Bug 35918: Fix auto library connect (AutoLocation)
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2024-02-14 16:34:28 UTC
Size:
3.32 KB
patch
obsolete
>From b249e99a555b8306e5fb559f6a67db1aa3c74cad Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Fri, 26 Jan 2024 08:58:17 +0100 >Subject: [PATCH] Bug 35918: Fix auto library connect (AutoLocation) > >This code is a bit weird, its purpose it to auto select the library depending on the IP. >A problem appears if the same IP is used, then the user's choice will >might be overwritten randomly by another library. > >To recreate the problem: >Turn on AutoLocation >Use koha/koha @CPL for test >And the following config: >*************************** 1. row *************************** >branchcode: CPL >branchname: Centerville > branchip: 172.18.0.1 >*************************** 2. row *************************** >branchcode: FFL >branchname: Fairfield > branchip: 172.18.0.1 >*************************** 3. row *************************** >branchcode: FPL >branchname: Fairview > branchip: 172.18.0.4 > >Connect and select CPL. Randomly FFL will be picked instead. > >Signed-off-by: Magnus Enger <magnus@libriotech.no> >Tested this on top of 35890 and 35904 because git bz said they were required dependencies. >Figured out the IP Koha was seeing me as coming from in /var/log/koha/kohadev/plack.log. >Added that IP to the branchip for Centerville, Fairfield and Fairview. Set AutoLocation = Yes. >After this I could recreate the problem: If i left the "Library" field in the login screen >at "My Library" I got logged into a random library selected from the three i had set >branchip for. Applying the patches fixed this, as expected. >Tests pass, with AutoLocation off. > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > C4/Auth.pm | 18 +++++++++++------- > 1 file changed, 11 insertions(+), 7 deletions(-) > >diff --git a/C4/Auth.pm b/C4/Auth.pm >index d0575177f16..233b43d6f29 100644 >--- a/C4/Auth.pm >+++ b/C4/Auth.pm >@@ -26,6 +26,7 @@ use CGI::Session; > use CGI::Session::ErrorHandler; > use URI; > use URI::QueryParam; >+use List::MoreUtils qw( uniq ); > > use C4::Context; > use C4::Templates; # to get the template >@@ -1213,15 +1214,18 @@ sub checkauth { > } > } > >- foreach my $br ( keys %$branches ) { >+ if ( C4::Context->preference('AutoLocation') && $auth_state ne 'failed' ) { >+ foreach my $br ( uniq( $branchcode, keys %$branches ) ) { > >- # now we work with the treatment of ip >- my $domain = $branches->{$br}->{'branchip'}; >- if ( $domain && $ip =~ /^$domain/ ) { >- $branchcode = $branches->{$br}->{'branchcode'}; >+ # now we work with the treatment of ip >+ my $domain = $branches->{$br}->{'branchip'}; >+ if ( $domain && $ip =~ /^$domain/ ) { >+ $branchcode = $branches->{$br}->{'branchcode'}; > >- # new op dev : add the branchname to the cookie >- $branchname = $branches->{$br}->{'branchname'}; >+ # new op dev : add the branchname to the cookie >+ $branchname = $branches->{$br}->{'branchname'}; >+ last; >+ } > } > } > >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 35918
:
161481
|
161482
|
161541
|
161542
|
162155
| 162156