Merge branch 'v2.0' of gitlab.ow2.org:lemonldap-ng/lemonldap-ng into v2.0
This commit is contained in:
commit
ce776c7994
|
@ -352,8 +352,7 @@ sub display {
|
||||||
# * Bad URL error
|
# * Bad URL error
|
||||||
elsif ($req->{error} == PE_LOGOUT_OK
|
elsif ($req->{error} == PE_LOGOUT_OK
|
||||||
or $req->{error} == PE_WAIT
|
or $req->{error} == PE_WAIT
|
||||||
or $req->{error} == PE_BADURL
|
or $req->{error} == PE_BADURL )
|
||||||
or $req->{error} == PE_BADCREDENTIALS )
|
|
||||||
{
|
{
|
||||||
%templateParams = (
|
%templateParams = (
|
||||||
%templateParams,
|
%templateParams,
|
||||||
|
|
|
@ -45,7 +45,12 @@ sub run {
|
||||||
}
|
}
|
||||||
|
|
||||||
# Avoid display notification if AuthResult is not null
|
# 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 } ) {
|
foreach ( sort sortByComment keys %{ $self->rules } ) {
|
||||||
$self->logger->debug( "Grant session condition -> "
|
$self->logger->debug( "Grant session condition -> "
|
||||||
|
|
|
@ -54,8 +54,8 @@ ok( $res->[2]->[0] =~ /<span trmsg="5"><\/span><\/div>/,
|
||||||
'dwho rejected with PE_BADCREDENTIALS' )
|
'dwho rejected with PE_BADCREDENTIALS' )
|
||||||
or print STDERR Dumper( $res->[2]->[0] );
|
or print STDERR Dumper( $res->[2]->[0] );
|
||||||
count(1);
|
count(1);
|
||||||
ok( $res->[2]->[0] =~ m%<span trspan="goToPortal">Go to portal</span>%,
|
ok( $res->[2]->[0] =~ m%<span trspan="connect">Connect</span>%,
|
||||||
'Found goToPortal button' )
|
'Found connect button' )
|
||||||
or print STDERR Dumper( $res->[2]->[0] );
|
or print STDERR Dumper( $res->[2]->[0] );
|
||||||
count(1);
|
count(1);
|
||||||
|
|
||||||
|
@ -125,8 +125,8 @@ ok(
|
||||||
'rtyler rejected with PE_BADCREDENTIALS'
|
'rtyler rejected with PE_BADCREDENTIALS'
|
||||||
) or print STDERR Dumper( $res->[2]->[0] );
|
) or print STDERR Dumper( $res->[2]->[0] );
|
||||||
count(1);
|
count(1);
|
||||||
ok( $res->[2]->[0] =~ m%<span trspan="goToPortal">Go to portal</span>%,
|
ok( $res->[2]->[0] =~ m%<span trspan="connect">Connect</span>%,
|
||||||
'Found goToPortal button' )
|
'Found connect button' )
|
||||||
or print STDERR Dumper( $res->[2]->[0] );
|
or print STDERR Dumper( $res->[2]->[0] );
|
||||||
count(1);
|
count(1);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user