-# -*- tab-width: 8 -*-
-# NOTE: This file uses 8-character tabs; do not change the tab size!
-
-package C4::Auth;
+package C4::Auth_with_ldap;
# Copyright 2000-2002 Katipo Communications
#
use strict;
use Digest::MD5 qw(md5_base64);
-require Exporter;
use C4::Context;
-use C4::Output; # to get the template
-use C4::Interface::CGI::Output;
-use C4::Members;
+use C4::Members qw(AddMember );
-# use Net::LDAP;
+use Net::LDAP;
+use Net::LDAP::Filter;
# use Net::LDAP qw(:all);
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-# set the version for version checking
-$VERSION = 0.01;
+BEGIN {
+ require Exporter;
+ $VERSION = 3.01; # set the version for version checking
+ our $debug = $ENV{DEBUG} || 0;
+ @ISA = qw(Exporter C4::Auth);
+ @EXPORT = qw( checkauth );
+}
=head1 NAME
=head1 SYNOPSIS
- use CGI;
- use C4::Auth;
-
- my $query = new CGI;
-
- my ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name => "opac-main.tmpl",
- query => $query,
- type => "opac",
- authnotrequired => 1,
- flagsrequired => {circulate => 1},
- });
-
- print $query->header(
- -type => 'utf-8',
- -cookie => $cookie
- ), $template->output;
-
-
-=head1 DESCRIPTION
-
- The main function of this module is to provide
- authentification. However the get_template_and_user function has
- been provided so that a users login information is passed along
- automatically. This gets loaded into the template.
+ use C4::Auth_with_ldap;
=head1 LDAP specific
- This module is specific to LDAP authentification. It requires Net::LDAP package and a working LDAP server.
+ This module is specific to LDAP authentification. It requires Net::LDAP package and one or more
+ working LDAP servers.
To use it :
- * move initial Auth.pm elsewhere
- * Search the string LOCAL
- * modify the code between LOCAL and /LOCAL to fit your LDAP server parameters & fields
- * rename this module to Auth.pm
- That should be enough.
-
-=head1 FUNCTIONS
-
-=over 2
+ * Modify ldapserver and ldapinfos via web "Preferences".
+ * Modify the values (right side) of %mapping pairs, to match your LDAP fields.
+ * Modify $ldapname and $ldappassword, if required.
+
+ 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.
+
+ Make sure that the required fields are populated in your LDAP database. What are they? Well, in
+ mysql you can check the database table "borrowers" like this:
+
+ mysql> show COLUMNS from borrowers;
+ +------------------+--------------+------+-----+---------+----------------+
+ | Field | Type | Null | Key | Default | Extra |
+ +------------------+--------------+------+-----+---------+----------------+
+ | borrowernumber | int(11) | NO | PRI | NULL | auto_increment |
+ | cardnumber | varchar(16) | YES | UNI | NULL | |
+ | surname | mediumtext | NO | | | |
+ | firstname | text | YES | | NULL | |
+ | title | mediumtext | YES | | NULL | |
+ | othernames | mediumtext | YES | | NULL | |
+ | initials | text | YES | | NULL | |
+ | streetnumber | varchar(10) | YES | | NULL | |
+ | streettype | varchar(50) | YES | | NULL | |
+ | address | mediumtext | NO | | | |
+ | address2 | text | YES | | NULL | |
+ | city | mediumtext | NO | | | |
+ | zipcode | varchar(25) | YES | | NULL | |
+ | email | mediumtext | YES | | NULL | |
+ | phone | text | YES | | NULL | |
+ | mobile | varchar(50) | YES | | NULL | |
+ | fax | mediumtext | YES | | NULL | |
+ | emailpro | text | YES | | NULL | |
+ | phonepro | text | YES | | NULL | |
+ | B_streetnumber | varchar(10) | YES | | NULL | |
+ | B_streettype | varchar(50) | YES | | NULL | |
+ | B_address | varchar(100) | YES | | NULL | |
+ | B_city | mediumtext | YES | | NULL | |
+ | B_zipcode | varchar(25) | YES | | NULL | |
+ | B_email | text | YES | | NULL | |
+ | B_phone | mediumtext | YES | | NULL | |
+ | dateofbirth | date | YES | | NULL | |
+ | branchcode | varchar(10) | NO | MUL | | |
+ | categorycode | varchar(10) | NO | MUL | | |
+ | dateenrolled | date | YES | | NULL | |
+ | dateexpiry | date | YES | | NULL | |
+ | gonenoaddress | tinyint(1) | YES | | NULL | |
+ | lost | tinyint(1) | YES | | NULL | |
+ | debarred | tinyint(1) | YES | | NULL | |
+ | contactname | mediumtext | YES | | NULL | |
+ | contactfirstname | text | YES | | NULL | |
+ | contacttitle | text | YES | | NULL | |
+ | guarantorid | int(11) | YES | | NULL | |
+ | borrowernotes | mediumtext | YES | | NULL | |
+ | relationship | varchar(100) | YES | | NULL | |
+ | ethnicity | varchar(50) | YES | | NULL | |
+ | ethnotes | varchar(255) | YES | | NULL | |
+ | sex | varchar(1) | YES | | NULL | |
+ | password | varchar(30) | YES | | NULL | |
+ | flags | int(11) | YES | | NULL | |
+ | userid | varchar(30) | YES | MUL | NULL | |
+ | opacnote | mediumtext | YES | | NULL | |
+ | contactnote | varchar(255) | YES | | NULL | |
+ | sort1 | varchar(80) | YES | | NULL | |
+ | sort2 | varchar(80) | YES | | NULL | |
+ +------------------+--------------+------+-----+---------+----------------+
+ 50 rows in set (0.01 sec)
+
+ Then %mappings establishes the relationship between mysql field and LDAP attribute.
=cut
-@ISA = qw(Exporter);
-@EXPORT = qw(
- &checkauth
- &get_template_and_user
+# Redefine checkauth:
+# connect to LDAP (named or anonymous)
+# ~ retrieves $userid from "uid"
+# ~ then compares $password with userPassword
+# ~ then gets the LDAP entry
+# ~ and calls the memberadd if necessary
+
+use vars qw(%mapping @ldaphosts $base $ldapname $ldappassword);
+
+%mapping = (
+ firstname => 'givenName',
+ surname => 'sn',
+ address => 'postalAddress',
+ city => 'l',
+ zipcode => 'postalCode',
+ branchcode => 'branch',
+ emailaddress => 'mail',
+ categorycode => 'employeeType',
+ phone => 'telephoneNumber',
);
-=item get_template_and_user
-
- my ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name => "opac-main.tmpl",
- query => $query,
- type => "opac",
- authnotrequired => 1,
- flagsrequired => {circulate => 1},
- });
-
- This call passes the C<query>, C<flagsrequired> and C<authnotrequired>
- to C<&checkauth> (in this module) to perform authentification.
- See C<&checkauth> for an explanation of these parameters.
-
- The C<template_name> is then used to find the correct template for
- the page. The authenticated users details are loaded onto the
- template in the HTML::Template LOOP variable C<USER_INFO>. Also the
- C<sessionID> is passed to the template. This can be used in templates
- if cookies are disabled. It needs to be put as and input to every
- authenticated page.
-
- More information on the C<gettemplate> sub can be found in the
- Output.pm module.
-
-=cut
-
-sub get_template_and_user {
- my $in = shift;
- my $template =
- gettemplate( $in->{'template_name'}, $in->{'type'}, $in->{'query'} );
- my ( $user, $cookie, $sessionID, $flags ) = checkauth(
- $in->{'query'},
- $in->{'authnotrequired'},
- $in->{'flagsrequired'},
- $in->{'type'}
- );
-
- my $borrowernumber;
- if ($user) {
- $template->param( loggedinusername => $user );
- $template->param( sessionID => $sessionID );
-
- $borrowernumber = getborrowernumber($user);
- my ( $borr, $alternativeflags ) =
- GetMemberDetails( $borrowernumber );
- my @bordat;
- $bordat[0] = $borr;
- $template->param( USER_INFO => \@bordat, );
-
- # We are going to use the $flags returned by checkauth
- # to create the template's parameters that will indicate
- # which menus the user can access.
- if ( $flags && $flags->{superlibrarian} == 1 ) {
- $template->param( CAN_user_circulate => 1 );
- $template->param( CAN_user_catalogue => 1 );
- $template->param( CAN_user_parameters => 1 );
- $template->param( CAN_user_borrowers => 1 );
- $template->param( CAN_user_permission => 1 );
- $template->param( CAN_user_reserveforothers => 1 );
- $template->param( CAN_user_borrow => 1 );
- $template->param( CAN_user_editcatalogue => 1 );
- $template->param( CAN_user_updatecharge => 1 );
- $template->param( CAN_user_editauthorities => 1 );
- $template->param( CAN_user_acquisition => 1 );
- $template->param( CAN_user_management => 1 );
- $template->param( CAN_user_tools => 1 );
- $template->param( CAN_user_serials => 1 );
- $template->param( CAN_user_reports => 1 );
- }
- if ( $flags && $flags->{circulate} == 1 ) {
- $template->param( CAN_user_circulate => 1 );
- }
-
- if ( $flags && $flags->{catalogue} == 1 ) {
- $template->param( CAN_user_catalogue => 1 );
- }
-
- if ( $flags && $flags->{parameters} == 1 ) {
- $template->param( CAN_user_parameters => 1 );
- $template->param( CAN_user_management => 1 );
- $template->param( CAN_user_tools => 1 );
- }
-
- if ( $flags && $flags->{borrowers} == 1 ) {
- $template->param( CAN_user_borrowers => 1 );
- }
-
- if ( $flags && $flags->{permissions} == 1 ) {
- $template->param( CAN_user_permission => 1 );
- }
-
- if ( $flags && $flags->{reserveforothers} == 1 ) {
- $template->param( CAN_user_reserveforothers => 1 );
- }
-
- if ( $flags && $flags->{borrow} == 1 ) {
- $template->param( CAN_user_borrow => 1 );
- }
-
- if ( $flags && $flags->{editcatalogue} == 1 ) {
- $template->param( CAN_user_editcatalogue => 1 );
- }
-
- if ( $flags && $flags->{updatecharges} == 1 ) {
- $template->param( CAN_user_updatecharge => 1 );
- }
-
- if ( $flags && $flags->{acquisition} == 1 ) {
- $template->param( CAN_user_acquisition => 1 );
- }
-
- if ( $flags && $flags->{management} == 1 ) {
- $template->param( CAN_user_management => 1 );
- $template->param( CAN_user_tools => 1 );
- }
-
- if ( $flags && $flags->{tools} == 1 ) {
- $template->param( CAN_user_tools => 1 );
- }
- if ( $flags && $flags->{editauthorities} == 1 ) {
- $template->param( CAN_user_editauthorities => 1 );
- }
-
- if ( $flags && $flags->{serials} == 1 ) {
- $template->param( CAN_user_serials => 1 );
- }
-
- if ( $flags && $flags->{reports} == 1 ) {
- $template->param( CAN_user_reports => 1 );
- }
- }
- $template->param( LibraryName => C4::Context->preference("LibraryName"), );
- return ( $template, $borrowernumber, $cookie );
+my $prefhost;
+if ($prefhost = C4::Context->preference('ldapserver')) { # assignment, not comparison
+ warn "Using preference from ldapserver: $prefhost";
+ (@ldaphosts) = split /\|/,$prefhost; # Potentially multiple LDAP hosts!
+ $base = C4::Context->preference('ldapinfos') || ''; # probably will fail w/o base
+} else {
+ (@ldaphosts) = (qw(localhost)); # Potentially multiple LDAP hosts!
+ $base = "dc=metavore,dc=com"; # But only 1 base.
}
-=item checkauth
-
- ($userid, $cookie, $sessionID) = &checkauth($query, $noauth, $flagsrequired, $type);
-
-Verifies that the user is authorized to run this script. If
-the user is authorized, a (userid, cookie, session-id, flags)
-quadruple is returned. If the user is not authorized but does
-not have the required privilege (see $flagsrequired below), it
-displays an error page and exits. Otherwise, it displays the
-login page and exits.
-
-Note that C<&checkauth> will return if and only if the user
-is authorized, so it should be called early on, before any
-unfinished operations (e.g., if you've opened a file, then
-C<&checkauth> won't close it for you).
-
-C<$query> is the CGI object for the script calling C<&checkauth>.
-
-The C<$noauth> argument is optional. If it is set, then no
-authorization is required for the script.
-
-C<&checkauth> fetches user and session information from C<$query> and
-ensures that the user is authorized to run scripts that require
-authorization.
-
-The C<$flagsrequired> argument specifies the required privileges
-the user must have if the username and password are correct.
-It should be specified as a reference-to-hash; keys in the hash
-should be the "flags" for the user, as specified in the Members
-intranet module. Any key specified must correspond to a "flag"
-in the userflags table. E.g., { circulate => 1 } would specify
-that the user must have the "circulate" privilege in order to
-proceed. To make sure that access control is correct, the
-C<$flagsrequired> parameter must be specified correctly.
-
-The C<$type> argument specifies whether the template should be
-retrieved from the opac or intranet directory tree. "opac" is
-assumed if it is not specified; however, if C<$type> is specified,
-"intranet" is assumed if it is not "opac".
-
-If C<$query> does not have a valid session ID associated with it
-(i.e., the user has not logged in) or if the session has expired,
-C<&checkauth> presents the user with a login page (from the point of
-view of the original script, C<&checkauth> does not return). Once the
-user has authenticated, C<&checkauth> restarts the original script
-(this time, C<&checkauth> returns).
-
-The login page is provided using a HTML::Template, which is set in the
-systempreferences table or at the top of this file. The variable C<$type>
-selects which template to use, either the opac or the intranet
-authentification template.
-
-C<&checkauth> returns a user ID, a cookie, and a session ID. The
-cookie should be sent back to the browser; it verifies that the user
-has authenticated.
-
-=cut
+$ldapname = "cn=Manager,$base"; # Your LDAP user. EDIT THIS LINE.
+$ldappassword = 'metavore'; # Your LDAP user's password. EDIT THIS LINE.
-sub checkauth {
- my $query = shift;
-
-# $authnotrequired will be set for scripts which will run without authentication
- my $authnotrequired = shift;
- my $flagsrequired = shift;
- my $type = shift;
- $type = 'opac' unless $type;
-
- my $dbh = C4::Context->dbh;
- my $timeout = C4::Context->preference('timeout');
- $timeout = 600 unless $timeout;
-
- my $template_name;
- if ( $type eq 'opac' ) {
- $template_name = "opac-auth.tmpl";
- }
- else {
- $template_name = "auth.tmpl";
- }
-
- # state variables
- my $loggedin = 0;
- my %info;
- my ( $userid, $cookie, $sessionID, $flags, $envcookie );
- my $logout = $query->param('logout.x');
- if ( $userid = $ENV{'REMOTE_USER'} ) {
-
- # Using Basic Authentication, no cookies required
- $cookie = $query->cookie(
- -name => 'sessionID',
- -value => '',
- -expires => ''
- );
- $loggedin = 1;
- }
- elsif ( $sessionID = $query->cookie('sessionID') ) {
- C4::Context->_new_userenv($sessionID);
- if ( my %hash = $query->cookie('userenv') ) {
- C4::Context::set_userenv(
- $hash{number}, $hash{id}, $hash{cardnumber},
- $hash{firstname}, $hash{surname}, $hash{branch},
- $hash{flags}, $hash{emailaddress},
- );
- }
- my ( $ip, $lasttime );
- ( $userid, $ip, $lasttime ) =
- $dbh->selectrow_array(
- "SELECT userid,ip,lasttime FROM sessions WHERE sessionid=?",
- undef, $sessionID );
- if ($logout) {
-
- # voluntary logout the user
- $dbh->do( "DELETE FROM sessions WHERE sessionID=?",
- undef, $sessionID );
- C4::Context->_unset_userenv($sessionID);
- $sessionID = undef;
- $userid = undef;
- open L, ">>/tmp/sessionlog";
- my $time = localtime( time() );
- printf L "%20s from %16s logged out at %30s (manually).\n", $userid,
- $ip, $time;
- close L;
- }
- if ($userid) {
- if ( $lasttime < time() - $timeout ) {
-
- # timed logout
- $info{'timed_out'} = 1;
- $dbh->do( "DELETE FROM sessions WHERE sessionID=?",
- undef, $sessionID );
- C4::Context->_unset_userenv($sessionID);
- $userid = undef;
- $sessionID = undef;
- open L, ">>/tmp/sessionlog";
- my $time = localtime( time() );
- printf L "%20s from %16s logged out at %30s (inactivity).\n",
- $userid, $ip, $time;
- close L;
- }
- elsif ( $ip ne $ENV{'REMOTE_ADDR'} ) {
-
- # Different ip than originally logged in from
- $info{'oldip'} = $ip;
- $info{'newip'} = $ENV{'REMOTE_ADDR'};
- $info{'different_ip'} = 1;
- $dbh->do( "DELETE FROM sessions WHERE sessionID=?",
- undef, $sessionID );
- C4::Context->_unset_userenv($sessionID);
- $sessionID = undef;
- $userid = undef;
- open L, ">>/tmp/sessionlog";
- my $time = localtime( time() );
- printf L
-"%20s from logged out at %30s (ip changed from %16s to %16s).\n",
- $userid, $time, $ip, $info{'newip'};
- close L;
- }
- else {
- $cookie = $query->cookie(
- -name => 'sessionID',
- -value => $sessionID,
- -expires => ''
- );
- $dbh->do( "UPDATE sessions SET lasttime=? WHERE sessionID=?",
- undef, ( time(), $sessionID ) );
- $flags = haspermission( $dbh, $userid, $flagsrequired );
- if ($flags) {
- $loggedin = 1;
- }
- else {
- $info{'nopermission'} = 1;
- }
- }
- }
- }
- unless ($userid) {
- $sessionID = int( rand() * 100000 ) . '-' . time();
- $userid = $query->param('userid');
- my $password = $query->param('password');
- C4::Context->_new_userenv($sessionID);
- my ( $return, $cardnumber ) = checkpw( $dbh, $userid, $password );
- if ($return) {
- $dbh->do( "DELETE FROM sessions WHERE sessionID=? AND userid=?",
- undef, ( $sessionID, $userid ) );
- $dbh->do(
-"INSERT INTO sessions (sessionID, userid, ip,lasttime) VALUES (?, ?, ?, ?)",
- undef,
- ( $sessionID, $userid, $ENV{'REMOTE_ADDR'}, time() )
- );
- open L, ">>/tmp/sessionlog";
- my $time = localtime( time() );
- printf L "%20s from %16s logged in at %30s.\n", $userid,
- $ENV{'REMOTE_ADDR'}, $time;
- close L;
- $cookie = $query->cookie(
- -name => 'sessionID',
- -value => $sessionID,
- -expires => ''
- );
- if ( $flags = haspermission( $dbh, $userid, $flagsrequired ) ) {
- $loggedin = 1;
- }
- else {
- $info{'nopermission'} = 1;
- C4::Context->_unset_userenv($sessionID);
- }
- if ( $return == 1 ) {
- my ( $borrowernumber, $firstname, $surname, $userflags,
- $branchcode, $emailaddress );
- my $sth =
- $dbh->prepare(
-"select borrowernumber,firstname,surname,flags,branchcode,emailaddress from borrowers where userid=?"
- );
- $sth->execute($userid);
- (
- $borrowernumber, $firstname, $surname, $userflags,
- $branchcode, $emailaddress
- )
- = $sth->fetchrow
- if ( $sth->rows );
- unless ( $sth->rows ) {
- my $sth =
- $dbh->prepare(
-"select borrowernumber,firstname,surname,flags,branchcode,emailaddress from borrowers where cardnumber=?"
- );
- $sth->execute($cardnumber);
- (
- $borrowernumber, $firstname, $surname, $userflags,
- $branchcode, $emailaddress
- )
- = $sth->fetchrow
- if ( $sth->rows );
- unless ( $sth->rows ) {
- $sth->execute($userid);
- (
- $borrowernumber, $firstname, $surname, $userflags,
- $branchcode, $emailaddress
- )
- = $sth->fetchrow
- if ( $sth->rows );
- }
- }
- my $hash =
- C4::Context::set_userenv( $borrowernumber, $userid,
- $cardnumber, $firstname, $surname, $branchcode, $userflags,
- $emailaddress, );
- $envcookie = $query->cookie(
- -name => 'userenv',
- -value => $hash,
- -expires => ''
- );
- }
- elsif ( $return == 2 ) {
-
- #We suppose the user is the superlibrarian
- my $hash = C4::Context::set_userenv(
- 0,
- 0,
- C4::Context->config('user'),
- C4::Context->config('user'),
- C4::Context->config('user'),
- "",
- 1,
- C4::Context->preference('KohaAdminEmailAddress')
- );
- $envcookie = $query->cookie(
- -name => 'userenv',
- -value => $hash,
- -expires => ''
- );
- }
- }
- else {
- if ($userid) {
- $info{'invalid_username_or_password'} = 1;
- C4::Context->_unset_userenv($sessionID);
- }
- }
- }
- my $insecure = C4::Context->boolean_preference('insecure');
-
- # finished authentification, now respond
- if ( $loggedin || $authnotrequired || ( defined($insecure) && $insecure ) )
- {
-
- # successful login
- unless ($cookie) {
- $cookie = $query->cookie(
- -name => 'sessionID',
- -value => '',
- -expires => ''
- );
- }
- if ($envcookie) {
- return ( $userid, [ $cookie, $envcookie ], $sessionID, $flags );
- }
- else {
- return ( $userid, $cookie, $sessionID, $flags );
- }
- }
-
- # else we have a problem...
- # get the inputs from the incoming query
- my @inputs = ();
- foreach my $name ( param $query) {
- (next) if ( $name eq 'userid' || $name eq 'password' );
- my $value = $query->param($name);
- push @inputs, { name => $name, value => $value };
- }
+my %config = (
+ anonymous => ($ldapname and $ldappassword) ? 0 : 1,
+ replicate => 1, # add from LDAP to Koha database for new user
+ update => 1, # update from LDAP to Koha database for existing user
+);
- my $template = gettemplate( $template_name, $type, $query );
- $template->param( INPUTS => \@inputs );
- $template->param( loginprompt => 1 ) unless $info{'nopermission'};
-
- my $self_url = $query->url( -absolute => 1 );
- $template->param( url => $self_url );
- $template->param( \%info );
- $cookie = $query->cookie(
- -name => 'sessionID',
- -value => $sessionID,
- -expires => ''
- );
- print $query->header(
- -type => 'utf-8',
- -cookie => $cookie
- ),
- $template->output;
- exit;
+sub description ($) {
+ my $result = shift or return undef;
+ return "LDAP error #" . $result->code
+ . ": " . $result->error_name . "\n"
+ . "# " . $result->error_text . "\n";
}
-# this checkpw is a LDAP based one
-# it connects to LDAP (anonymous)
-# it retrieve $userid a-login
-# then compare $password with a-weak
-# then get the LDAP entry
-# and calls the memberadd if necessary
-
-sub checkpw {
- my ( $dbh, $userid, $password ) = @_;
- if ( $userid eq C4::Context->config('user')
+sub checkauth {
+ my ($dbh, $userid, $password) = @_;
+ if ( $userid eq C4::Context->config('user')
&& $password eq C4::Context->config('pass') )
{
-
- # Koha superuser account
- return 2;
+ return 2; # Koha superuser account
}
- ##################################################
- ### LOCAL
- ### Change the code below to match your own LDAP server.
- ##################################################
- # LDAP connexion parameters
- my $ldapserver = 'your.ldap.server.com';
-
- # Infos to do an anonymous bind
- my $ldapinfos = 'a-section=people,dc=emn,dc=fr ';
- my $name = "a-section=people,dc=emn,dc=fr";
- my $db = Net::LDAP->new($ldapserver);
-
- # do an anonymous bind
- my $res = $db->bind();
- if ( $res->code ) {
-
- # auth refused
- warn "LDAP Auth impossible : server not responding";
+ my $db = Net::LDAP->new(\@ldaphosts);
+ #$debug and $db->debug(5);
+ my $filter = Net::LDAP::Filter->new("uid=$userid") or die "Failed to create new Net::LDAP::Filter";
+ my $res = ($config{anonymous}) ? $db->bind : $db->bind($ldapname, password=>$ldappassword);
+ if ($res->code) { # connection refused
+ warn "LDAP bind failed as $ldapname: " . description($res);
return 0;
}
- else {
- my $userdnsearch = $db->search(
- base => $name,
- filter => "(a-login=$userid)",
- );
- if ( $userdnsearch->code || !( $userdnsearch->count eq 1 ) ) {
- warn "LDAP Auth impossible : user unknown in LDAP";
- return 0;
- }
-
- my $userldapentry = $userdnsearch->shift_entry;
- my $cmpmesg =
- $db->compare( $userldapentry, attr => 'a-weak', value => $password );
- ## HACK LMK
- ## ligne originale
- # if( $cmpmesg -> code != 6 ) {
- if ( ( $cmpmesg->code != 6 ) && !( $password eq "kivabien" ) ) {
- warn "LDAP Auth impossible : wrong password";
- return 0;
- }
-
- # build LDAP hash
- my %memberhash;
- my $x = $userldapentry->{asn}{attributes};
- my $key;
- foreach my $k (@$x) {
- foreach my $k2 ( keys %$k ) {
- if ( $k2 eq 'type' ) {
- $key = $$k{$k2};
- }
- else {
- my $a = @$k{$k2};
- foreach my $k3 (@$a) {
- $memberhash{$key} .= $k3 . " ";
- }
- }
- }
- }
-
- #
- # BUILD %borrower to CREATE or MODIFY BORROWER
- # change $memberhash{'xxx'} to fit your ldap structure.
- # check twice that mandatory fields are correctly filled
- #
- my %borrower;
- $borrower{cardnumber} = $userid;
- $borrower{firstname} = $memberhash{givenName}; # MANDATORY FIELD
- $borrower{surname} = $memberhash{sn}; # MANDATORY FIELD
- $borrower{initials} =
- substr( $borrower{firstname}, 0, 1 )
- . substr( $borrower{surname}, 0, 1 )
- . " "; # MANDATORY FIELD
- $borrower{streetaddress} = $memberhash{l} . " "; # MANDATORY FIELD
- $borrower{city} = " "; # MANDATORY FIELD
- $borrower{phone} = " "; # MANDATORY FIELD
- $borrower{branchcode} = $memberhash{branch}; # MANDATORY FIELD
- $borrower{emailaddress} = $memberhash{mail};
- $borrower{categorycode} = $memberhash{employeeType};
- ##################################################
- ### /LOCAL
- ### No change needed after this line (unless there's a bug ;-) )
- ##################################################
- # check if borrower exists
- my $sth =
- $dbh->prepare("select password from borrowers where cardnumber=?");
- $sth->execute($userid);
- if ( $sth->rows ) {
-
- # it exists, MODIFY
- # warn "MODIF borrower";
- my $sth2 =
- $dbh->prepare(
-"update borrowers set firstname=?,surname=?,initials=?,streetaddress=?,city=?,phone=?, categorycode=?,branchcode=?,emailaddress=?,sort1=? where cardnumber=?"
- );
- $sth2->execute(
- $borrower{firstname}, $borrower{surname},
- $borrower{initials}, $borrower{streetaddress},
- $borrower{city}, $borrower{phone},
- $borrower{categorycode}, $borrower{branchcode},
- $borrower{emailaddress}, $borrower{sort1},
- $userid
- );
- }
- else {
-
- # it does not exists, ADD borrower
- # warn "ADD borrower";
- my $borrowerid = newmember(%borrower);
- }
-
- #
- # CREATE or MODIFY PASSWORD/LOGIN
- #
- # search borrowerid
- $sth =
- $dbh->prepare(
- "select borrowernumber from borrowers where cardnumber=?");
- $sth->execute($userid);
- my ($borrowerid) = $sth->fetchrow;
-
- # warn "change password for $borrowerid setting $password";
- my $digest = md5_base64($password);
- changepassword( $userid, $borrowerid, $digest );
- }
-
- # INTERNAL AUTH
- my $sth =
- $dbh->prepare("select password,cardnumber from borrowers where userid=?");
- $sth->execute($userid);
- if ( $sth->rows ) {
- my ( $md5password, $cardnumber ) = $sth->fetchrow;
- if ( md5_base64($password) eq $md5password ) {
- return 1, $cardnumber;
- }
- }
- $sth = $dbh->prepare("select password from borrowers where cardnumber=?");
- $sth->execute($userid);
- if ( $sth->rows ) {
- my ($md5password) = $sth->fetchrow;
- if ( md5_base64($password) eq $md5password ) {
- return 1, $userid;
- }
- }
- return 0;
+ my $search = $db->search(
+ base => $base,
+ filter => $filter,
+ # attrs => ['*'],
+ ) or die "LDAP search failed to return object.";
+ my $count = $search->count;
+ if ($search->code > 0) {
+ warn sprintf("LDAP Auth rejected : %s gets %d hits\n", $filter->as_string, $count) . description($search);
+ return 0;
+ }
+ if ($count != 1) {
+ warn sprintf("LDAP Auth rejected : %s gets %d hits\n", $filter->as_string, $count);
+ return 0;
+ }
+
+ 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;
+ }
+ unless($config{update} or $config{replicate}) {
+ return 1;
+ }
+ my %borrower = ldap_entry_2_hash($userldapentry,$userid);
+ if (exists_local($userid)) {
+ ($config{update} ) and &update_local($userid,$password,%borrower);
+ } else {
+ ($config{replicate}) and AddMember(%borrower);
+ }
+ return 1;
}
-sub getuserflags {
- my $cardnumber = shift;
- my $dbh = shift;
- my $userflags;
- my $sth = $dbh->prepare("SELECT flags FROM borrowers WHERE cardnumber=?");
- $sth->execute($cardnumber);
- my ($flags) = $sth->fetchrow;
- $sth = $dbh->prepare("SELECT bit, flag, defaulton FROM userflags");
- $sth->execute;
-
- while ( my ( $bit, $flag, $defaulton ) = $sth->fetchrow ) {
- if ( ( $flags & ( 2**$bit ) ) || $defaulton ) {
- $userflags->{$flag} = 1;
- }
- }
- return $userflags;
+# Pass LDAP entry object and local cardnumber (userid).
+# Returns borrower hash.
+# Edit %mapping so $memberhash{'xxx'} fits your ldap structure.
+# Ensure that mandatory fields are correctly filled!
+#
+sub ldap_entry_2_hash ($$) {
+ my $userldapentry = shift;
+ my %borrower = ( cardnumber => shift );
+ my %memberhash;
+ my $x = $userldapentry->{asn}{attributes} or return undef;
+ my $key;
+ foreach my $k (@$x) {
+ foreach my $k2 ( keys %$k ) {
+ if ($k2 eq 'type') {
+ $key = $$k{$k2};
+ } else {
+ $memberhash{$key} .= map {$_ . " "} @$k{$k2};
+ }
+ }
+ }
+ foreach my $key (%mapping) {
+ my $data = $memberhash{$mapping{$key}};
+ defined $data or $data = ' ';
+ $borrower{$key} = ($data ne '') ? $data : ' ' ;
+ }
+ $borrower{initials} = $memberhash{initials} ||
+ ( substr($borrower{'firstname'},0,1)
+ . substr($borrower{ 'surname' },0,1)
+ . " ");
+ return %borrower;
}
-sub haspermission {
- my ( $dbh, $userid, $flagsrequired ) = @_;
- my $sth = $dbh->prepare("SELECT cardnumber FROM borrowers WHERE userid=?");
- $sth->execute($userid);
- my ($cardnumber) = $sth->fetchrow;
- ($cardnumber) || ( $cardnumber = $userid );
- my $flags = getuserflags( $cardnumber, $dbh );
- my $configfile;
- if ( $userid eq C4::Context->config('user') ) {
-
- # Super User Account from /etc/koha.conf
- $flags->{'superlibrarian'} = 1;
- }
- if ( $userid eq 'demo' && C4::Context->config('demo') ) {
+sub exists_local($) {
+ my $sth = C4::Context->dbh->prepare("SELECT password from borrowers WHERE cardnumber=?");
+ $sth->execute(shift);
+ return ($sth->rows) ? 1 : 0 ;
+}
- # Demo user that can do "anything" (demo=1 in /etc/koha.conf)
- $flags->{'superlibrarian'} = 1;
- }
- return $flags if $flags->{superlibrarian};
- foreach ( keys %$flagsrequired ) {
- return $flags if $flags->{$_};
- }
- return 0;
+sub update_local($$%) {
+ # warn "MODIFY borrower";
+ my $userid = shift or return undef;
+ my $digest = md5_base64(shift) or return undef;
+ my %borrower = shift or return undef;
+ my $dbh = C4::Context->dbh;
+ my $sth = $dbh->prepare("
+UPDATE borrowers
+SET firstname=?,surname=?,initials=?,streetaddress=?,city=?,phone=?, categorycode=?,branchcode=?,emailaddress=?,sort1=?
+WHERE cardnumber=?
+ ");
+ $sth->execute(
+ $borrower{firstname}, $borrower{surname},
+ $borrower{initials}, $borrower{streetaddress},
+ $borrower{city}, $borrower{phone},
+ $borrower{categorycode}, $borrower{branchcode},
+ $borrower{emailaddress}, $borrower{sort1},
+ $userid
+ );
+
+ # MODIFY PASSWORD/LOGIN
+ # search borrowerid
+ $sth = $dbh->prepare("SELECT borrowernumber from borrowers WHERE cardnumber=? ");
+ $sth->execute($userid);
+ my ($borrowerid) = $sth->fetchrow;
+ # warn "change local password for $borrowerid setting $password";
+ changepassword($userid, $borrowerid, $digest);
+
+ # Confirm changes
+ my $cardnumber;
+ $sth = $dbh->prepare("SELECT password,cardnumber from borrowers WHERE userid=? ");
+ $cardnumber = confirmer($sth,$userid,$digest) and return $cardnumber;
+ $sth = $dbh->prepare("SELECT password,cardnumber from borrowers WHERE cardnumber=? ");
+ $cardnumber = confirmer($sth,$userid,$digest) and return $cardnumber;
+ die "Unexpected error after password update to $userid / $cardnumber.";
}
-sub getborrowernumber {
- my ($userid) = @_;
- my $dbh = C4::Context->dbh;
- for my $field ( 'userid', 'cardnumber' ) {
- my $sth =
- $dbh->prepare("select borrowernumber from borrowers where $field=?");
- $sth->execute($userid);
- if ( $sth->rows ) {
- my ($bnumber) = $sth->fetchrow;
- return $bnumber;
- }
+sub confirmer($$$) {
+ my $sth = shift or return undef;
+ my $userid = shift or return undef;
+ my $digest = shift or return undef;
+ $sth->execute($userid);
+ if ($sth->rows) {
+ my ($md5password, $othernum) = $sth->fetchrow;
+ ($digest eq $md5password) and return $othernum;
+ warn "Password mismatch after update to userid=$userid";
+ return undef;
}
- return 0;
+ warn "Could not recover record after updating password for userid=$userid";
+ return 0;
}
-
-END { } # module clean-up code here (global destructor)
1;
__END__
CGI(3)
-C4::Output(3)
+Net::LDAP()
Digest::MD5(3)
projects / koha_fer / blobdiff