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

Display ppolicy info messsages only if authentication is valid (#669)

Browse Source
This commit is contained in:
Clément Oudot 2014-01-17 22:24:11 +00:00
parent eb419fa3f4
commit fc61240345
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_LDAP.pm
View File

@ -15,7 +15,7 @@ use Unicode::String qw(utf8);
use strict;
our @EXPORT = qw(ldap);
our $VERSION = '1.3.0';
our $VERSION = '1.3.2';
our $ppLoaded = 0;
BEGIN {
@ -167,24 +167,7 @@ sub userBind {
return ( $mesg->code == 0 ? PE_OK : PE_LDAPERROR );
}
# Get expiration warning and graces
if ( $resp->grace_authentications_remaining ) {
$self->{portal}->info( "<h3>"
. $resp->grace_authentications_remaining . " "
. $self->{portal}->msg(PM_PP_GRACE)
. "</h3>" );
}
if ( $resp->time_before_expiration ) {
$self->{portal}->info(
"<h3>"
. sprintf(
$self->{portal}->msg(PM_PP_EXP_WARNING),
$self->{portal}->convertSec( $resp->time_before_expiration )
)
. "</h3>"
);
}
# Check for ppolicy error
my $pp_error = $resp->pp_error;
if ( defined $pp_error ) {
$self->{portal}->_sub( 'userError',
@ -202,6 +185,26 @@ sub userBind {
]->[$pp_error];
}
elsif ( $mesg->code == 0 ) {
# Get expiration warning and graces
if ( $resp->grace_authentications_remaining ) {
$self->{portal}->info( "<h3>"
. $resp->grace_authentications_remaining . " "
. $self->{portal}->msg(PM_PP_GRACE)
. "</h3>" );
}
if ( $resp->time_before_expiration ) {
$self->{portal}->info(
"<h3>"
. sprintf(
$self->{portal}->msg(PM_PP_EXP_WARNING),
$self->{portal}
->convertSec( $resp->time_before_expiration )
)
. "</h3>"
);
}
return PE_OK;
}
}