use strict;
use Digest::MD5 qw(md5_base64);
+use C4::Debug;
use C4::Context;
use C4::Members qw(AddMember changepassword);
use C4::Utils qw( :all );
BEGIN {
require Exporter;
- $VERSION = 3.02; # set the version for version checking
- $debug = $ENV{DEBUG} || 0;
+ $VERSION = 3.03; # set the version for version checking
@ISA = qw(Exporter);
@EXPORT = qw( checkpw_ldap );
}
use vars qw($mapping @ldaphosts $base $ldapname $ldappassword);
my $context = C4::Context->new() or die 'C4::Context->new failed';
-my $ldap = $context->{server}->{ldapserver} or die 'No "ldapserver" in server hash from KOHA_CONF: ' . $ENV{KOHA_CONF};
+my $ldap = C4::Context->config("ldapserver") or die 'No "ldapserver" in server hash from KOHA_CONF: ' . $ENV{KOHA_CONF};
my $prefhost = $ldap->{hostname} or die ldapserver_error('hostname');
my $base = $ldap->{base} or die ldapserver_error('base');
-$ldapname = $ldap->{user} or die ldapserver_error('user');
-$ldappassword = $ldap->{pass} or die ldapserver_error('pass');
+$ldapname = $ldap->{user} ;
+$ldappassword = $ldap->{pass} ;
our %mapping = %{$ldap->{mapping}} or die ldapserver_error('mapping');
my @mapkeys = keys %mapping;
$debug and print STDERR "Got ", scalar(@mapkeys), " ldap mapkeys ( total ): ", join ' ', @mapkeys, "\n";
}
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;
* Modify ldapserver element in KOHA_CONF
* Establish field mapping in <mapping> element.
- It is assumed your user records are stored according to the inetOrgPerson schema, RFC#2798.
- Thus the username must match the "uid" field, and the password must match the "userpassword" field.
+ For example, if your user records are stored according to the inetOrgPerson schema, RFC#2798,
+ the username would match the "uid" field, and the password should match the "userpassword" field.
- Make sure that the required fields are populated in your LDAP database (and mapped in KOHA_CONF).
+ Make sure that ALL required fields are populated by your LDAP database (and mapped in KOHA_CONF).
What are the required fields? Well, in mysql you can check the database table "borrowers" like this:
mysql> show COLUMNS from borrowers;
=head1 KOHA_CONF and field mapping
-Example XML stanza for LDAP configuration in KOHA_CONF:
-
- <!-- LDAP SERVER (optional) -->
- <server id="ldapserver" listenref="ldapserver">
- <hostname>localhost</hostname>
- <base>dc=metavore,dc=com</base>
- <user>cn=Manager,dc=metavore,dc=com</user> <!-- DN, if not anonymous -->
- <pass>metavore</pass> <!-- password, if not anonymous -->
- <replicate>1</replicate> <!-- add new users from LDAP to Koha database -->
- <update>1</update> <!-- update existing users in Koha database -->
- <mapping> <!-- match koha SQL field names to your LDAP record field names -->
- <firstname is="givenname" ></firstname>
- <surname is="sn" ></surname>
- <address is="postaladdress" ></address>
- <city is="l" >Athens, OH</city>
- <zipcode is="postalcode" ></zipcode>
- <branchcode is="branch" >MAIN</branchcode>
- <userid is="uid" ></userid>
- <password is="userpassword" ></password>
- <email is="mail" ></email>
- <categorycode is="employeetype" >PT</categorycode>
- <phone is="telephonenumber"></phone>
- </mapping>
- </server>
+Example XML stanza for LDAP configuration in KOHA_CONF.
+
+ <config>
+ ...
+ <useldapserver>1</useldapserver>
+ <!-- LDAP SERVER (optional) -->
+ <ldapserver id="ldapserver">
+ <hostname>localhost</hostname>
+ <base>dc=metavore,dc=com</base>
+ <user>cn=Manager,dc=metavore,dc=com</user> <!-- DN, if not anonymous -->
+ <pass>metavore</pass> <!-- password, if not anonymous -->
+ <replicate>1</replicate> <!-- add new users from LDAP to Koha database -->
+ <update>1</update> <!-- update existing users in Koha database -->
+ <auth_by_bind>0</auth_by_bind> <!-- set to 1 to authenticate by binding instead of
+ password comparison, e.g., to use Active Directory -->
+ <mapping> <!-- match koha SQL field names to your LDAP record field names -->
+ <firstname is="givenname" ></firstname>
+ <surname is="sn" ></surname>
+ <address is="postaladdress" ></address>
+ <city is="l" >Athens, OH</city>
+ <zipcode is="postalcode" ></zipcode>
+ <branchcode is="branch" >MAIN</branchcode>
+ <userid is="uid" ></userid>
+ <password is="userpassword" ></password>
+ <email is="mail" ></email>
+ <categorycode is="employeetype" >PT</categorycode>
+ <phone is="telephonenumber"></phone>
+ </mapping>
+ </ldapserver>
+ </config>
The <mapping> subelements establish the relationship between mysql fields and LDAP attributes. The element name
is the column in mysql, with the "is" characteristic set to the LDAP attribute name. Optionally, any content
projects / koha.git / blobdiff