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

Render getModule() usable with connected users (fixes: #2664)

Browse Source
This commit is contained in:
Yadd 2022-02-05 11:55:17 +01:00
parent 6df19ff183
commit d3389a7370
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm
View File

@ -134,7 +134,7 @@ sub login {
return $self->do( return $self->do(
$req, $req,
[ [
'checkUnauthLogout', 'controlUrl', # Fix 2342 'checkUnauthLogout', 'controlUrl', # Fix 2342
@{ $self->beforeAuth }, $self->authProcess, @{ $self->beforeAuth }, $self->authProcess,
@{ $self->betweenAuthAndData }, $self->sessionData, @{ $self->betweenAuthAndData }, $self->sessionData,
@{ $self->afterData }, $self->validSession, @{ $self->afterData }, $self->validSession,
@ -148,7 +148,7 @@ sub postLogin {
return $self->do( return $self->do(
$req, $req,
[ [
'checkUnauthLogout', 'restoreArgs', # Fix 2342 'checkUnauthLogout', 'restoreArgs', # Fix 2342
'controlUrl', @{ $self->beforeAuth }, 'controlUrl', @{ $self->beforeAuth },
$self->authProcess, @{ $self->betweenAuthAndData }, $self->authProcess, @{ $self->betweenAuthAndData },
$self->sessionData, @{ $self->afterData }, $self->sessionData, @{ $self->afterData },
@ -189,7 +189,8 @@ sub refresh {
$req->user( $data{_user} || $data{ $self->conf->{whatToTrace} } ); $req->user( $data{_user} || $data{ $self->conf->{whatToTrace} } );
$req->id( $data{_session_id} ); $req->id( $data{_session_id} );
foreach ( keys %data ) { foreach ( keys %data ) {
delete $data{$_} unless ( /^_/ or /^(?:startTime|authenticationLevel)$/ ); delete $data{$_}
unless ( /^_/ or /^(?:startTime|authenticationLevel)$/ );
} }
$data{_updateTime} = strftime( "%Y%m%d%H%M%S", localtime() ); $data{_updateTime} = strftime( "%Y%m%d%H%M%S", localtime() );
$self->logger->debug( $self->logger->debug(
@ -356,6 +357,11 @@ sub do {
sub getModule { sub getModule {
my ( $self, $req, $type ) = @_; my ( $self, $req, $type ) = @_;
if ( my $val =
$req->userData->{ { auth => '_auth', user => '_userDB' }->{$type} } )
{
return $val;
}
if ( if (
my $mod = { my $mod = {
auth => '_authentication', auth => '_authentication',