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

Remove double slashes in _pdata->{_url} + Don't overwrite $self-portal if already set (#2594)

Browse Source
This commit is contained in:
Yadd 2022-02-01 12:49:34 +01:00
parent 21f4ca1f35
commit 3f42113229
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/PSGI.pm
View File

@ -128,7 +128,7 @@ sub _authAndTrace {
eval "require $type"; eval "require $type";
die $@ if ($@); die $@ if ($@);
my ( $res, $session ) = $type->run( $req, $self->{rule} ); my ( $res, $session ) = $type->run( $req, $self->{rule} );
eval { $self->portal( $type->tsv->{portal}->() ) }; eval { $self->portal( $type->tsv->{portal}->() ) } unless $self->portal;
$self->logger->warn($@) if $@; $self->logger->warn($@) if $@;
$req->userData($session) if ($session); $req->userData($session) if ($session);
@ -201,7 +201,7 @@ sub userId {
my $userId = my $userId =
$req->userData->{ $Lemonldap::NG::Handler::Main::tsv->{whatToTrace} $req->userData->{ $Lemonldap::NG::Handler::Main::tsv->{whatToTrace}
|| '_whatToTrace' } || '_whatToTrace' }
|| $req->userData->{'_user'} # Fix 2377 || $req->userData->{'_user'} # Fix 2377
|| 'anonymous'; || 'anonymous';
$self->logger->debug("Returned userId: $userId"); $self->logger->debug("Returned userId: $userId");

4
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Issuer.pm
View File

@ -100,7 +100,7 @@ sub _redirect {
$self->logger->debug( $self->logger->debug(
'Add ' . $self->ipath . ', ' . $self->ipath . 'Path in keepPdata' ); 'Add ' . $self->ipath . ', ' . $self->ipath . 'Path in keepPdata' );
push @{ $req->pdata->{keepPdata} }, $self->ipath, $self->ipath . 'Path'; push @{ $req->pdata->{keepPdata} }, $self->ipath, $self->ipath . 'Path';
$req->{urldc} = $self->conf->{portal} . '/' . $self->path; $req->{urldc} = $self->p->buildUrl( $self->path );
$req->pdata->{_url} = encode_base64( $req->urldc, '' ); $req->pdata->{_url} = encode_base64( $req->urldc, '' );
$req->pdata->{issuerTs} = time; $req->pdata->{issuerTs} = time;
} }
@ -128,7 +128,7 @@ sub _redirect {
$self->restoreRequest( $_[0], $ir ); $self->restoreRequest( $_[0], $ir );
$self->cleanPdata( $_[0] ); $self->cleanPdata( $_[0] );
return $self->run( @_, @path ); return $self->run( @_, @path );
} }
: () : ()
) )
] ]