gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 29744: (QA follow-up) Only consider PLACK_ENV for underscore 

When run under certain circumstances (in jenkins, for example) some ENV
variables are set for convenience, like PLACK_WORKERS and
PLACK_MAX_REQUESTS and is causing some tests to fail (notably, shib
ones).

This patch makes the regex only consider PLACK_ENV when testing for the
underscore case.

Tests are updated accordingly, and they are also rewritten to test for
boolean values instead of empty string, or zero or one, etc. The
implementation shouldn't matter as long as the boolean evaluation is
correct and it is clearer for devs what to expect.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Tomas Cohen Arazi 2022-09-23 12:04:54 -03:00
parent aa4dc15b97
commit e509485161
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C4/Context.pm
View File

@ -1009,7 +1009,7 @@ this is a PSGI app or a CGI app, and implementing code as appropriate.
sub psgi_env {
my ( $self ) = @_;
return any { /^(psgi|plack)[._]/i } keys %ENV;
return any { /^(psgi\.|plack\.|PLACK_ENV$)/i } keys %ENV;
}
=head3 is_internal_PSGI_request

27
t/Context.t
View File

@ -147,32 +147,33 @@ is( C4::Context->interface( 'CRON' ), 'cron', 'interface cron uc' );
}
subtest 'psgi_env and is_internal_PSGI_request' => sub {
plan tests => 11;
local %ENV = ( no_plack => 1 );
is( C4::Context->psgi_env, q{}, 'no_plack' );
ok( !C4::Context->psgi_env, 'no_plack' );
$ENV{plackishere} = 1;
is( C4::Context->psgi_env, q{}, 'plackishere is wrong' );
ok( !C4::Context->psgi_env, 'plackishere is wrong' );
$ENV{'plack.ishere'} = 1;
is( C4::Context->psgi_env, 1, 'plack.ishere' );
ok( C4::Context->psgi_env, 'plack.ishere' );
delete $ENV{'plack.ishere'};
is( C4::Context->psgi_env, q{}, 'plack.ishere was here' );
$ENV{'plack_ishere'} = 1;
is( C4::Context->psgi_env, 1, 'plack_ishere' );
delete $ENV{'plack_ishere'};
ok( !C4::Context->psgi_env, 'plack.ishere was here' );
$ENV{'plack_env'} = 1;
ok( C4::Context->psgi_env, 'plack_env' );
delete $ENV{'plack_env'};
$ENV{'psgi_whatever'} = 1;
is( C4::Context->psgi_env, 1, 'psgi_whatever' );
ok( !C4::Context->psgi_env, 'psgi_whatever' );
delete $ENV{'psgi_whatever'};
$ENV{'psgi.whatever'} = 1;
is( C4::Context->psgi_env, 1, 'psgi.whatever' );
ok( C4::Context->psgi_env, 'psgi.whatever' );
delete $ENV{'psgi.whatever'};
$ENV{'PSGI.UPPERCASE'} = 1;
is( C4::Context->psgi_env, 1, 'PSGI uppercase' );
ok( C4::Context->psgi_env, 'PSGI uppercase' );
$ENV{'REQUEST_URI'} = '/intranet/whatever';
is( C4::Context->is_internal_PSGI_request, 0, 'intranet not considered internal in regex' );
ok( !C4::Context->is_internal_PSGI_request, 'intranet not considered internal in regex' );
$ENV{'REQUEST_URI'} = '/api/v1/tralala';
is( C4::Context->is_internal_PSGI_request, 1, 'api considered internal in regex' );
ok( C4::Context->is_internal_PSGI_request, 'api considered internal in regex' );
delete $ENV{'PSGI.UPPERCASE'};
is( C4::Context->is_internal_PSGI_request, 0, 'api but no longer PSGI' );
ok( !C4::Context->is_internal_PSGI_request, 'api but no longer PSGI' );
};