Browse Source

Bug 28317: Use the default CGI::Session serializer

We remove YAML::Syck on bug 22824 and YAML on 27673, to use YAML::XS.
However we need one of them for CGI::Session::Serialize::yaml
It's preferable to change the serializer and use the default one instead
of writing one based on YAML::XS (or patch the existing ::yaml that does
not seem maintained).

There was an encoding bug reported on the default serializer (see commit
a858e8a8b8) but we fail to recreate it.

Test plan:
Create 3 libraries with branchcode=branchname: "CPL", "ÄÄÄ~ÄãÃ" and "✔️ ❤️ ★"
Use the 3 options of SessionStorage and switch from one logged in
library to another.
Confirm that everything is working correctly (ie. no ending issue in the
library name at the top-right corner)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
tags/v21.05.00
Jonathan Druart 1 month ago
parent
commit
cb90cbf4eb
4 changed files with 13 additions and 10 deletions
  1. +4
    -4
      C4/Auth.pm
  2. +7
    -3
      C4/Context.pm
  3. +2
    -2
      C4/InstallAuth.pm
  4. +0
    -1
      cpanfile

+ 4
- 4
C4/Auth.pm View File

@@ -1850,21 +1850,21 @@ sub _get_session_params {
my $storage_method = C4::Context->preference('SessionStorage');
if ( $storage_method eq 'mysql' ) {
my $dbh = C4::Context->dbh;
return { dsn => "driver:MySQL;serializer:yaml;id:md5", dsn_args => { Handle => $dbh } };
return { dsn => "driver:MySQL;id:md5", dsn_args => { Handle => $dbh } };
}
elsif ( $storage_method eq 'Pg' ) {
my $dbh = C4::Context->dbh;
return { dsn => "driver:PostgreSQL;serializer:yaml;id:md5", dsn_args => { Handle => $dbh } };
return { dsn => "driver:PostgreSQL;id:md5", dsn_args => { Handle => $dbh } };
}
elsif ( $storage_method eq 'memcached' && Koha::Caches->get_instance->memcached_cache ) {
my $memcached = Koha::Caches->get_instance()->memcached_cache;
return { dsn => "driver:memcached;serializer:yaml;id:md5", dsn_args => { Memcached => $memcached } };
return { dsn => "driver:memcached;id:md5", dsn_args => { Memcached => $memcached } };
}
else {
# catch all defaults to tmp should work on all systems
my $dir = C4::Context::temporary_directory;
my $instance = C4::Context->config( 'database' ); #actually for packages not exactly the instance name, but generally safer to leave it as it is
return { dsn => "driver:File;serializer:yaml;id:md5", dsn_args => { Directory => "$dir/cgisess_$instance" } };
return { dsn => "driver:File;id:md5", dsn_args => { Directory => "$dir/cgisess_$instance" } };
}
}



+ 7
- 3
C4/Context.pm View File

@@ -745,9 +745,13 @@ set_userenv is called in Auth.pm
#'
sub set_userenv {
shift @_;
my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $branchname, $userflags, $emailaddress, $shibboleth, $desk_id, $desk_name, $register_id, $register_name)=
map { Encode::is_utf8( $_ ) ? $_ : Encode::decode('UTF-8', $_) } # CGI::Session doesn't handle utf-8, so we decode it here
@_;
my (
$usernum, $userid, $usercnum, $userfirstname,
$usersurname, $userbranch, $branchname, $userflags,
$emailaddress, $shibboleth, $desk_id, $desk_name,
$register_id, $register_name
) = @_;

my $var=$context->{"activeuser"} || '';
my $cell = {
"number" => $usernum,


+ 2
- 2
C4/InstallAuth.pm View File

@@ -243,7 +243,7 @@ sub checkauth {
if ( $sessionID = $query->cookie("CGISESSID") ) {
C4::Context->_new_userenv($sessionID);
my $session =
CGI::Session->new( "driver:File;serializer:yaml", $sessionID,
CGI::Session->new( "driver:File", $sessionID,
{ Directory => $sessdir } );
if ( $session->param('cardnumber') ) {
C4::Context->set_userenv(
@@ -283,7 +283,7 @@ sub checkauth {
}
unless ($userid) {
my $session =
CGI::Session->new( "driver:File;serializer:yaml", undef, { Directory => $sessdir } );
CGI::Session->new( "driver:File", undef, { Directory => $sessdir } );
$sessionID = $session->id;
$userid = $query->param('userid');
C4::Context->_new_userenv($sessionID);


+ 0
- 1
cpanfile View File

@@ -10,7 +10,6 @@ requires 'CGI::Carp', '1.29';
requires 'CGI::Compile', '>= 0.17, != 0.24';
requires 'CGI::Emulate::PSGI', '0.20';
requires 'CGI::Session', '4.2';
requires 'CGI::Session::Serialize::yaml', '4.2';
requires 'CPAN::Meta', '2.150006';
requires 'Cache::Memcached', '1.30';
requires 'Cache::Memcached::Fast::Safe', '0.06';


Loading…
Cancel
Save