in Auth_with_ldap.pm try binding with user password or compare

This changes the checkpw code in Auth_with_ldap.  Along with comparing
the user entered password against the directory attibute userPassword
you can try to bind with the users dn and password.

This is controlled by the option auth_by_bind, which, if set, causes
this code to try binding instead of comparing.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
This commit is contained in:
Michael Hafen 2008-10-29 13:48:04 -06:00 committed by Galen Charlton
parent 02d23609b1
commit 083ad362e1
1 changed files with 14 additions and 4 deletions

View File

@ -100,10 +100,20 @@ sub checkpw_ldap {
}
my $userldapentry = $search->shift_entry;
my $cmpmesg = $db->compare( $userldapentry, attr=>'userpassword', value => $password );
if ($cmpmesg->code != 6) {
warn "LDAP Auth rejected : invalid password for user '$userid'. " . description($cmpmesg);
return 0;
if ( $ldap->{auth_by_bind} ) {
my $user_ldapname = $userldapentry->dn();
my $user_db = Net::LDAP->new( [$prefhost] );
$res = $user_db->bind( $user_ldapname, password => $password );
if ( $res->code ) {
$debug and warn "Bind as user failed ". description( $res );
return 0;
}
} else {
my $cmpmesg = $db->compare( $userldapentry, attr=>'userpassword', value => $password );
if ($cmpmesg->code != 6) {
warn "LDAP Auth rejected : invalid password for user '$userid'. " . description($cmpmesg);
return 0;
}
}
unless ($config{update} or $config{replicate}) {
return 1;