dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix combination logout if condition changed (Fixes: #2165)

Browse Source
This commit is contained in:
Xavier Guimard 2020-05-04 15:29:16 +02:00
parent d7dc218bca
commit 52938222a5
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Combination.pm
View File

@ -137,9 +137,16 @@ sub authLogout {
# Avoid warning msg at first access
$req->userData->{_combinationTry} ||= 0;
my ( $res, $name ) =
my $sub =
$req->data->{combinationStack}->[ $req->userData->{_combinationTry} ]
->[0]->( 'authLogout', @_ );
->[0];
unless ($sub) {
$self->logger->warn(
"Condition changed between and logout, unable to select good backend"
);
return PE_ERROR;
}
my ( $res, $name ) = $sub->( 'authLogout', @_ );
$self->logger->debug(qq'User disconnected using scheme "$name"');
return $res;
}

30
lemonldap-ng-portal/t/91-Memory-Leak.t
View File

@ -1,7 +1,7 @@
#!perl -w
use constant HAS_LEAKTRACE => eval { require Test::LeakTrace };
use Test::More HAS_LEAKTRACE
? ( tests => 4 )
? ( tests => 5 )
: ( skip_all => 'require Test::LeakTrace' );
use Test::LeakTrace;
@ -31,17 +31,21 @@ leaks_cmp_ok {
TODO: {
local $TODO = "Not yet fully cleaned";
fail "Unable to really destroy a portal object for now";
# Test with initialization
Lemonldap::NG::Handler::PSGI::Main->init($ini);
Lemonldap::NG::Handler::PSGI::Main->checkConf(1);
leaks_cmp_ok {
my $p = Lemonldap::NG::Portal::Main->new();
$p->init($ini);
$p = undef;
@Lemonldap::NG::Handler::Main::_onReload = ();
#$ini = undef;
diag "After onReload clean\n";
}
'<', 1;
#my $p = Lemonldap::NG::Portal::Main->new();
#$p->init($ini);
#leaks_cmp_ok {
# my $p2 = Lemonldap::NG::Portal::Main->new();
# $p2->init($ini);
# pop @Lemonldap::NG::Handler::Main::_onReload;
#} '<', 1;
}
my $p = Lemonldap::NG::Portal::Main->new();
$p->init($ini);
print STDERR Dumper($p->conf);
leaks_cmp_ok {
$p->reloadConf($p->conf);
}
'<', 1;