From 10702f3402b49b3ed88ca43695b5223eb4a921aa Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 18 May 2021 10:43:05 +0200 Subject: [PATCH] Bug 28367: Fix plack condition in C4/Auth_with_shibboleth.pm C4/Auth_with_shibboleth.pm has: if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) When others have: if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) This has been highlighted by https://gitlab.com/koha-community/koha-testing-docker/-/issues/249 that introduces a PLACK_WORKERS env vars, and t/Auth_with_shibboleth.t was failing with # Failed test 'checkpw_shib tests' # at t/Auth_with_shibboleth.t line 335. Invalid parameter passed, categorycode= does not exist# Looks like your test exited with 255 just after 5. Signed-off-by: Jonathan Druart (cherry picked from commit 21d8298c7708281a9ab87851ea55f75559e57cf4) Signed-off-by: Fridolin Somers (cherry picked from commit 794e3b3505464c2da846192b58d3e6a23e939d0c) Signed-off-by: Andrew Fuerste-Henry --- C4/Auth_with_shibboleth.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/C4/Auth_with_shibboleth.pm b/C4/Auth_with_shibboleth.pm index 1e89020c02..2b59f86c05 100644 --- a/C4/Auth_with_shibboleth.pm +++ b/C4/Auth_with_shibboleth.pm @@ -150,7 +150,7 @@ sub _sync { my %borrower; $borrower{'borrowernumber'} = $borrowernumber; while ( my ( $key, $entry ) = each %{$config->{'mapping'}} ) { - if ( any { /(^psgi|^plack)/i } keys %ENV ) { + if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) { $borrower{$key} = ( $entry->{'is'} && $ENV{"HTTP_" . uc($entry->{'is'}) } ) || $entry->{'content'} || ''; } else { $borrower{$key} = ( $entry->{'is'} && $ENV{ $entry->{'is'} } ) || $entry->{'content'} || ''; -- 2.39.5