Commit ce776c79 authored by Christophe Maudoux's avatar Christophe Maudoux 🐛

Merge branch 'v2.0' of gitlab.ow2.org:lemonldap-ng/lemonldap-ng into v2.0

parents d1ce6384 4366488f
......@@ -352,8 +352,7 @@ sub display {
# * Bad URL error
elsif ($req->{error} == PE_LOGOUT_OK
or $req->{error} == PE_WAIT
or $req->{error} == PE_BADURL
or $req->{error} == PE_BADCREDENTIALS )
or $req->{error} == PE_BADURL )
{
%templateParams = (
%templateParams,
......
......@@ -45,7 +45,12 @@ sub run {
}
# Avoid display notification if AuthResult is not null
return PE_BADCREDENTIALS if $req->authResult > PE_OK;
if ( $req->authResult > PE_OK ) {
$self->logger->debug(
"Bad authentication, do not check grant session rules");
$req->userData( {} );
return PE_BADCREDENTIALS;
}
foreach ( sort sortByComment keys %{ $self->rules } ) {
$self->logger->debug( "Grant session condition -> "
......
......@@ -54,8 +54,8 @@ ok( $res->[2]->[0] =~ /<span trmsg="5"><\/span><\/div>/,
'dwho rejected with PE_BADCREDENTIALS' )
or print STDERR Dumper( $res->[2]->[0] );
count(1);
ok( $res->[2]->[0] =~ m%<span trspan="goToPortal">Go to portal</span>%,
'Found goToPortal button' )
ok( $res->[2]->[0] =~ m%<span trspan="connect">Connect</span>%,
'Found connect button' )
or print STDERR Dumper( $res->[2]->[0] );
count(1);
......@@ -125,8 +125,8 @@ ok(
'rtyler rejected with PE_BADCREDENTIALS'
) or print STDERR Dumper( $res->[2]->[0] );
count(1);
ok( $res->[2]->[0] =~ m%<span trspan="goToPortal">Go to portal</span>%,
'Found goToPortal button' )
ok( $res->[2]->[0] =~ m%<span trspan="connect">Connect</span>%,
'Found connect button' )
or print STDERR Dumper( $res->[2]->[0] );
count(1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment