Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 36102: Fix expired session on the login page of the installer (?)

Browse source 
I *think* this change fixes a bug when starting the installer with an
expired session. I am no longer able to reproduce the problem however.

Just skip if it does not make sense.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Jonathan Druart 2024-02-20 15:12:23 +01:00
parent 59470197c2
commit a44a01aaf3
Signed by: jonathan.druart
GPG key ID: A085E712BEF0E0F0
1 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
C4/InstallAuth.pm
View file

@ -245,11 +245,14 @@ sub checkauth {
# state variables
my $loggedin = 0;
my %info;
my ( $userid, $cookie, $sessionID, $flags, $envcookie );
my ( $userid, $cookie, $flags, $envcookie );
my $logout = $query->param('logout.x');
if ( $sessionID = $query->cookie("CGISESSID") ) {
my $sessionID = $query->cookie("CGISESSID");
my $session = Koha::Session->get_session( { sessionID => $sessionID, storage_method => 'file' } );
if ( $session ) {
C4::Context->_new_userenv($sessionID);
my $session = Koha::Session->get_session( { sessionID => $sessionID, storage_method => 'file' } );
if ( $session->param('cardnumber') ) {
C4::Context->set_userenv(
$session->param('number'),
@ -272,26 +275,18 @@ sub checkauth {
$loggedin = 1;
$userid = $session->param('cardnumber');
}
if ($logout) {
# voluntary logout the user
C4::Context->_unset_userenv($sessionID);
$sessionID = undef;
$userid = undef;
# Commented out due to its lack of usefulness
# open L, ">>/tmp/sessionlog";
# my $time = localtime( time() );
# printf L "%20s from %16s logged out at %30s (manually).\n", $userid,
# $ip, $time;
# close L;
}
}
if ($logout || !$session) {
# voluntary logout the user
C4::Context->_unset_userenv($sessionID);
$session = Koha::Session->get_session( { storage_method => 'file' } );
}
$sessionID = $session->id;
unless ($userid) {
my $session = Koha::Session->get_session( { sessionID => $sessionID, storage_method => 'file' } );
$sessionID = $session->id;
$userid = $query->param('login_userid');
C4::Context->_new_userenv($sessionID);
$userid = $query->param('login_userid');
my $password = $query->param('login_password');
C4::Context->_new_userenv($sessionID);
my ( $return, $cardnumber ) = checkpw( $userid, $password );
@ -393,7 +388,7 @@ sub checkauth {
}
unless ( $sessionID ) {
my $session = Koha::Session->get_session( { storage_method => 'file' } );
$session = Koha::Session->get_session( { storage_method => 'file' } );
$sessionID = $session->id;
}
$template->param(