[Koha-cvs] koha/C4 Auth.pm Auth_with_ldap.pm [rel_3_0]
Antoine Farnault
antoine at koha-fr.org
Mon Nov 20 19:09:51 CET 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 06/11/20 18:09:51
Modified files:
C4 : Auth.pm Auth_with_ldap.pm
Log message:
- adding editauthorities userflags
- re-indenting.
- removing warn compilation.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.54.2.9&r2=1.54.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth_with_ldap.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5.2.2&r2=1.5.2.3
Patches:
Index: Auth.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth.pm,v
retrieving revision 1.54.2.9
retrieving revision 1.54.2.10
diff -u -b -r1.54.2.9 -r1.54.2.10
--- Auth.pm 20 Nov 2006 17:50:07 -0000 1.54.2.9
+++ Auth.pm 20 Nov 2006 18:09:51 -0000 1.54.2.10
@@ -36,8 +36,9 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.54.2.9 $' =~ /\d+/g;
- shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
+$VERSION = do { my @v = '$Revision: 1.54.2.10 $' =~ /\d+/g;
+ shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
+};
=head1 NAME
@@ -143,12 +144,12 @@
$template->param( CAN_user_permission => 1 );
$template->param( CAN_user_reserveforothers => 1 );
$template->param( CAN_user_borrow => 1 );
- # $template->param( CAN_user_reserveforself => 1 );
$template->param( CAN_user_editcatalogue => 1 );
$template->param( CAN_user_updatecharge => 1 );
$template->param( CAN_user_acquisition => 1 );
$template->param( CAN_user_management => 1 );
$template->param( CAN_user_tools => 1 );
+ $template->param( CAN_user_editauthorities => 1 );
}
if ( $flags && $flags->{circulate} == 1 ) {
@@ -199,40 +200,55 @@
}
if ( $flags && $flags->{tools} == 1 ) {
- $template->param(CAN_user_tools => 1); }
+ $template->param( CAN_user_tools => 1 );
+ }
+
+ if ( $flags && $flags->{editauthorities} == 1 ) {
+ $template->param( CAN_user_editauthorities => 1 );
+ }
}
- if ($in->{'type'} eq "intranet") {
+ if ( $in->{'type'} eq "intranet" ) {
$template->param(
- intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetcolorstylesheet =>
+ C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet => C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),
intranetuserjs => C4::Context->preference("intranetuserjs"),
TemplateEncoding => C4::Context->preference("TemplateEncoding"),
AmazonContent => C4::Context->preference("AmazonContent"),
LibraryName => C4::Context->preference("LibraryName"),
- branchname => C4::Context->userenv?C4::Context->userenv->{"branchname"}:"",
+ branchname => C4::Context->userenv
+ ? C4::Context->userenv->{"branchname"}
+ : "",
);
}
else {
- warn "template type should be OPAC, here it is=[".$in->{'type'}."]" unless ($in->{'type'} eq 'opac');
+ warn "template type should be OPAC, here it is=[" . $in->{'type'} . "]"
+ unless ( $in->{'type'} eq 'opac' );
$template->param(
- suggestion => "".C4::Context->preference("suggestion"),
- virtualshelves => "".C4::Context->preference("virtualshelves"),
- OpacNav => "".C4::Context->preference("OpacNav"),
- opacheader => "".C4::Context->preference("opacheader"),
- opaccredits => "".C4::Context->preference("opaccredits"),
- opacsmallimage => "".C4::Context->preference("opacsmallimage"),
- opaclayoutstylesheet => "".C4::Context->preference("opaclayoutstylesheet"),
- opaccolorstylesheet => "".C4::Context->preference("opaccolorstylesheet"),
- opaclanguagesdisplay => "".C4::Context->preference("opaclanguagesdisplay"),
- opacuserlogin => "".C4::Context->preference("opacuserlogin"),
- opacbookbag => "".C4::Context->preference("opacbookbag"),
- TemplateEncoding => "".C4::Context->preference("TemplateEncoding"),
- AmazonContent => "".C4::Context->preference("AmazonContent"),
- LibraryName => "".C4::Context->preference("LibraryName"),
- branchname => C4::Context->userenv?C4::Context->userenv->{"branchname"}:"",
+ suggestion => "" . C4::Context->preference("suggestion"),
+ virtualshelves => "" . C4::Context->preference("virtualshelves"),
+ OpacNav => "" . C4::Context->preference("OpacNav"),
+ opacheader => "" . C4::Context->preference("opacheader"),
+ opaccredits => "" . C4::Context->preference("opaccredits"),
+ opacsmallimage => "" . C4::Context->preference("opacsmallimage"),
+ opaclayoutstylesheet => ""
+ . C4::Context->preference("opaclayoutstylesheet"),
+ opaccolorstylesheet => ""
+ . C4::Context->preference("opaccolorstylesheet"),
+ opaclanguagesdisplay => ""
+ . C4::Context->preference("opaclanguagesdisplay"),
+ opacuserlogin => "" . C4::Context->preference("opacuserlogin"),
+ opacbookbag => "" . C4::Context->preference("opacbookbag"),
+ TemplateEncoding => ""
+ . C4::Context->preference("TemplateEncoding"),
+ AmazonContent => "" . C4::Context->preference("AmazonContent"),
+ LibraryName => "" . C4::Context->preference("LibraryName"),
+ branchname => C4::Context->userenv
+ ? C4::Context->userenv->{"branchname"}
+ : "",
OpacPasswordChange => C4::Context->preference("OpacPasswordChange"),
opacreadinghistory => C4::Context->preference("opacreadinghistory"),
opacuserjs => C4::Context->preference("opacuserjs"),
@@ -451,16 +467,20 @@
C4::Context->_unset_userenv($sessionID);
}
if ( $return == 1 ) {
- my ( $borrowernumber, $firstname, $surname, $userflags, $branchcode,
- $branchname, $branchprinter, $emailaddress );
+ my (
+ $borrowernumber, $firstname, $surname,
+ $userflags, $branchcode, $branchname,
+ $branchprinter, $emailaddress
+ );
my $sth =
$dbh->prepare(
"select borrowernumber, firstname, surname, flags, borrowers.branchcode, branches.branchname as branchname,branches.branchprinter as branchprinter, email from borrowers left join branches on borrowers.branchcode=branches.branchcode where userid=?"
);
$sth->execute($userid);
(
- $borrowernumber, $firstname, $surname, $userflags, $branchcode,
- $branchname, $branchprinter, $emailaddress
+ $borrowernumber, $firstname, $surname,
+ $userflags, $branchcode, $branchname,
+ $branchprinter, $emailaddress
)
= $sth->fetchrow
if ( $sth->rows );
@@ -473,8 +493,9 @@
);
$sth->execute($cardnumber);
(
- $borrowernumber, $firstname, $surname, $userflags, $branchcode,
- $branchcode, $branchprinter, $emailaddress
+ $borrowernumber, $firstname, $surname,
+ $userflags, $branchcode, $branchcode,
+ $branchprinter, $emailaddress
)
= $sth->fetchrow
if ( $sth->rows );
@@ -584,7 +605,8 @@
}
my $template = gettemplate( $template_name, $type, $query );
- $template->param(INPUTS => \@inputs,
+ $template->param(
+ INPUTS => \@inputs,
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
opaclargeimage => C4::Context->preference("opaclargeimage"),
@@ -598,7 +620,8 @@
opaclanguagesdisplay => C4::Context->preference("opaclanguagesdisplay"),
opacuserjs => C4::Context->preference("opacuserjs"),
- intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ intranetcolorstylesheet =>
+ C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet => C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),
intranetuserjs => C4::Context->preference("intranetuserjs"),
@@ -632,23 +655,34 @@
# INTERNAL AUTH
my $sth =
- $dbh->prepare("select password,cardnumber,borrowernumber,userid,firstname,surname,branchcode,flags from borrowers where userid=?");
+ $dbh->prepare(
+"select password,cardnumber,borrowernumber,userid,firstname,surname,branchcode,flags from borrowers where userid=?"
+ );
$sth->execute($userid);
if ( $sth->rows ) {
- my ( $md5password, $cardnumber,$borrowernumber,$userid,$firstname,$surname,$branchcode,$flags ) = $sth->fetchrow;
+ my ( $md5password, $cardnumber, $borrowernumber, $userid, $firstname,
+ $surname, $branchcode, $flags )
+ = $sth->fetchrow;
if ( md5_base64($password) eq $md5password ) {
- C4::Context->set_userenv("$borrowernumber",$userid,$cardnumber,$firstname,$surname,$branchcode,$flags);
+ C4::Context->set_userenv( "$borrowernumber", $userid, $cardnumber,
+ $firstname, $surname, $branchcode, $flags );
return 1, $cardnumber;
}
}
- $sth = $dbh->prepare("select password,cardnumber,borrowernumber,userid, firstname,surname,branchcode,flags from borrowers where cardnumber=?");
+ $sth =
+ $dbh->prepare(
+"select password,cardnumber,borrowernumber,userid, firstname,surname,branchcode,flags from borrowers where cardnumber=?"
+ );
$sth->execute($userid);
if ( $sth->rows ) {
- my ( $md5password, $cardnumber,$borrowernumber,$userid,$firstname,$surname,$branchcode,$flags ) = $sth->fetchrow;
+ my ( $md5password, $cardnumber, $borrowernumber, $userid, $firstname,
+ $surname, $branchcode, $flags )
+ = $sth->fetchrow;
if ( md5_base64($password) eq $md5password ) {
- C4::Context->set_userenv($borrowernumber,$userid,$cardnumber,$firstname,$surname,$branchcode,$flags);
+ C4::Context->set_userenv( $borrowernumber, $userid, $cardnumber,
+ $firstname, $surname, $branchcode, $flags );
return 1, $userid;
}
}
Index: Auth_with_ldap.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth_with_ldap.pm,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -b -r1.5.2.2 -r1.5.2.3
--- Auth_with_ldap.pm 20 Nov 2006 17:50:07 -0000 1.5.2.2
+++ Auth_with_ldap.pm 20 Nov 2006 18:09:51 -0000 1.5.2.3
@@ -29,6 +29,7 @@
use C4::Interface::CGI::Output;
use C4::Circulation::Circ2; # getpatroninformation
use C4::Members;
+
# use Net::LDAP;
# use Net::LDAP qw(:all);
@@ -85,8 +86,6 @@
=cut
-
-
@ISA = qw(Exporter);
@EXPORT = qw(
&checkauth
@@ -119,94 +118,106 @@
=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 $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);
+ $template->param( loggedinusername => $user );
+ $template->param( sessionID => $sessionID );
$borrowernumber = getborrowernumber($user);
- my ($borr, $alternativeflags) = getpatroninformation(undef, $borrowernumber);
+ my ( $borr, $alternativeflags ) =
+ getpatroninformation( undef, $borrowernumber );
my @bordat;
$bordat[0] = $borr;
- $template->param(USER_INFO => \@bordat,
- );
+ $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_reserveforself => 1);
- $template->param(CAN_user_editcatalogue => 1);
- $template->param(CAN_user_updatecharge => 1);
- $template->param(CAN_user_acquisition => 1);
- $template->param(CAN_user_management => 1);
- $template->param(CAN_user_tools => 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->{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 );
+ }
- if ($flags && $flags->{borrowers} == 1) {
- $template->param(CAN_user_borrowers => 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->{permissions} == 1) {
- $template->param(CAN_user_permission => 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->{reserveforothers} == 1) {
- $template->param(CAN_user_reserveforothers => 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->{borrow} == 1) {
- $template->param(CAN_user_borrow => 1); }
+ if ( $flags && $flags->{reserveforothers} == 1 ) {
+ $template->param( CAN_user_reserveforothers => 1 );
+ }
- if ($flags && $flags->{editcatalogue} == 1) {
- $template->param(CAN_user_editcatalogue => 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->{updatecharges} == 1 ) {
+ $template->param( CAN_user_updatecharge => 1 );
+ }
- if ($flags && $flags->{acquisition} == 1) {
- $template->param(CAN_user_acquisition => 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->{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->{tools} == 1 ) {
+ $template->param( CAN_user_tools => 1 );
}
- $template->param(
- LibraryName => C4::Context->preference("LibraryName"),
- );
- return ($template, $borrowernumber, $cookie);
+ if ( $flags && $flags->{editauthorities} == 1 ) {
+ $template->param( CAN_user_editauthorities => 1 );
+ }
+ }
+ $template->param( LibraryName => C4::Context->preference("LibraryName"), );
+ return ( $template, $borrowernumber, $cookie );
}
-
=item checkauth
($userid, $cookie, $sessionID) = &checkauth($query, $noauth, $flagsrequired, $type);
@@ -265,11 +276,10 @@
=cut
-
-
sub checkauth {
- my $query=shift;
- # $authnotrequired will be set for scripts which will run without authentication
+ my $query = shift;
+
+# $authnotrequired will be set for scripts which will run without authentication
my $authnotrequired = shift;
my $flagsrequired = shift;
my $type = shift;
@@ -280,157 +290,206 @@
$timeout = 600 unless $timeout;
my $template_name;
- if ($type eq 'opac') {
+ if ( $type eq 'opac' ) {
$template_name = "opac-auth.tmpl";
- } else {
+ }
+ else {
$template_name = "auth.tmpl";
}
# state variables
my $loggedin = 0;
my %info;
- my ($userid, $cookie, $sessionID, $flags,$envcookie);
+ my ( $userid, $cookie, $sessionID, $flags, $envcookie );
my $logout = $query->param('logout.x');
- if ($userid = $ENV{'REMOTE_USER'}) {
+ if ( $userid = $ENV{'REMOTE_USER'} ) {
+
# Using Basic Authentication, no cookies required
- $cookie=$query->cookie(-name => 'sessionID',
+ $cookie = $query->cookie(
+ -name => 'sessionID',
-value => '',
- -expires => '');
+ -expires => ''
+ );
$loggedin = 1;
- } elsif ($sessionID=$query->cookie('sessionID')) {
+ }
+ elsif ( $sessionID = $query->cookie('sessionID') ) {
C4::Context->_new_userenv($sessionID);
- if (my %hash=$query->cookie('userenv')){
+ 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},
+ $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(
+ my ( $ip, $lasttime );
+ ( $userid, $ip, $lasttime ) =
+ $dbh->selectrow_array(
"SELECT userid,ip,lasttime FROM sessions WHERE sessionid=?",
- undef, $sessionID);
+ undef, $sessionID );
if ($logout) {
+
# voluntary logout the user
- $dbh->do("DELETE FROM sessions WHERE sessionID=?", undef, $sessionID);
+ $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;
+ 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) {
+ if ( $lasttime < time() - $timeout ) {
+
# timed logout
$info{'timed_out'} = 1;
- $dbh->do("DELETE FROM sessions WHERE sessionID=?", undef, $sessionID);
+ $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;
+ 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'}) {
+ }
+ 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);
+ $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'};
+ 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',
+ }
+ 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);
+ -expires => ''
+ );
+ $dbh->do( "UPDATE sessions SET lasttime=? WHERE sessionID=?",
+ undef, ( time(), $sessionID ) );
+ $flags = haspermission( $dbh, $userid, $flagsrequired );
if ($flags) {
$loggedin = 1;
- } else {
+ }
+ else {
$info{'nopermission'} = 1;
}
}
}
}
unless ($userid) {
- $sessionID=int(rand()*100000).'-'.time();
- $userid=$query->param('userid');
- my $password=$query->param('password');
+ $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);
+ 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()));
+ $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;
+ 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',
+ $cookie = $query->cookie(
+ -name => 'sessionID',
-value => $sessionID,
- -expires => '');
- if ($flags = haspermission($dbh, $userid, $flagsrequired)) {
+ -expires => ''
+ );
+ if ( $flags = haspermission( $dbh, $userid, $flagsrequired ) ) {
$loggedin = 1;
- } else {
+ }
+ 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=?");
+ 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=?");
+ (
+ $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){
+ (
+ $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);
+ (
+ $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',
+ 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) {
+ -expires => ''
+ );
+ }
+ elsif ( $return == 2 ) {
+
#We suppose the user is the superlibrarian
my $hash = C4::Context::set_userenv(
- 0,0,
+ 0,
+ 0,
C4::Context->config('user'),
C4::Context->config('user'),
C4::Context->config('user'),
- "",1,C4::Context->preference('KohaAdminEmailAddress')
+ "",
+ 1,
+ C4::Context->preference('KohaAdminEmailAddress')
);
- $envcookie=$query->cookie(-name => 'userenv',
+ $envcookie = $query->cookie(
+ -name => 'userenv',
-value => $hash,
- -expires => '');
+ -expires => ''
+ );
+ }
}
- } else {
+ else {
if ($userid) {
$info{'invalid_username_or_password'} = 1;
C4::Context->_unset_userenv($sessionID);
@@ -438,48 +497,56 @@
}
}
my $insecure = C4::Context->boolean_preference('insecure');
+
# finished authentification, now respond
- if ($loggedin || $authnotrequired || (defined($insecure) && $insecure)) {
+ if ( $loggedin || $authnotrequired || ( defined($insecure) && $insecure ) )
+ {
+
# successful login
unless ($cookie) {
- $cookie=$query->cookie(-name => 'sessionID',
+ $cookie = $query->cookie(
+ -name => 'sessionID',
-value => '',
- -expires => '');
+ -expires => ''
+ );
+ }
+ if ($envcookie) {
+ return ( $userid, [ $cookie, $envcookie ], $sessionID, $flags );
}
- if ($envcookie){
- return ($userid, [$cookie,$envcookie], $sessionID, $flags)
- } else {
- return ($userid, $cookie, $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 @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};
+ push @inputs, { name => $name, value => $value };
}
- 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',
+ 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 => '');
+ -expires => ''
+ );
print $query->header(
- -type => guesstype($template->output),
+ -type => guesstype( $template->output ),
-cookie => $cookie
- ), $template->output;
+ ),
+ $template->output;
exit;
}
-
-
# this checkpw is a LDAP based one
# it connects to LDAP (anonymous)
# it retrieve $userid a-login
@@ -488,8 +555,11 @@
# and calls the memberadd if necessary
sub checkpw {
- my ($dbh, $userid, $password) = @_;
- if ($userid eq C4::Context->config('user') && $password eq C4::Context->config('pass')) {
+ my ( $dbh, $userid, $password ) = @_;
+ if ( $userid eq C4::Context->config('user')
+ && $password eq C4::Context->config('pass') )
+ {
+
# Koha superuser account
return 2;
}
@@ -499,51 +569,59 @@
##################################################
# 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 );
+ my $db = Net::LDAP->new($ldapserver);
# do an anonymous bind
- my $res =$db->bind();
- if($res->code) {
+ my $res = $db->bind();
+ if ( $res->code ) {
+
# auth refused
warn "LDAP Auth impossible : server not responding";
return 0;
- } else {
- my $userdnsearch = $db->search(base => $name,
- filter =>"(a-login=$userid)",
+ }
+ else {
+ my $userdnsearch = $db->search(
+ base => $name,
+ filter => "(a-login=$userid)",
);
- if($userdnsearch->code || ! ( $userdnsearch-> count eq 1 ) ) {
+ 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 );
+ 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" ) ) {
+ 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 $x = $userldapentry->{asn}{attributes};
my $key;
- foreach my $k ( @$x) {
- foreach my $k2 (keys %$k) {
- if ($k2 eq 'type') {
+ foreach my $k (@$x) {
+ foreach my $k2 ( keys %$k ) {
+ if ( $k2 eq 'type' ) {
$key = $$k{$k2};
- } else {
+ }
+ else {
my $a = @$k{$k2};
foreach my $k3 (@$a) {
- $memberhash{$key} .= $k3." ";
+ $memberhash{$key} .= $k3 . " ";
}
}
}
}
+
#
# BUILD %borrower to CREATE or MODIFY BORROWER
# change $memberhash{'xxx'} to fit your ldap structure.
@@ -553,8 +631,11 @@
$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{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
@@ -565,88 +646,107 @@
### 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=?");
+ my $sth =
+ $dbh->prepare("select password from borrowers where cardnumber=?");
$sth->execute($userid);
- if ($sth->rows) {
+ 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 {
+ # 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";
+ # warn "ADD borrower";
my $borrowerid = newmember(%borrower);
}
+
#
# CREATE or MODIFY PASSWORD/LOGIN
#
# search borrowerid
- $sth = $dbh->prepare("select borrowernumber from borrowers where cardnumber=?");
+ $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);
+ 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=?");
+ # 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;
+ if ( $sth->rows ) {
+ my ( $md5password, $cardnumber ) = $sth->fetchrow;
+ if ( md5_base64($password) eq $md5password ) {
+ return 1, $cardnumber;
}
}
- my $sth=$dbh->prepare("select password from borrowers where cardnumber=?");
+ $sth = $dbh->prepare("select password from borrowers where cardnumber=?");
$sth->execute($userid);
- if ($sth->rows) {
+ if ( $sth->rows ) {
my ($md5password) = $sth->fetchrow;
- if (md5_base64($password) eq $md5password) {
- return 1,$userid;
+ if ( md5_base64($password) eq $md5password ) {
+ return 1, $userid;
}
}
return 0;
}
sub getuserflags {
- my $cardnumber=shift;
- my $dbh=shift;
+ my $cardnumber = shift;
+ my $dbh = shift;
my $userflags;
- my $sth=$dbh->prepare("SELECT flags FROM borrowers WHERE cardnumber=?");
+ 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 = $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;
+
+ while ( my ( $bit, $flag, $defaulton ) = $sth->fetchrow ) {
+ if ( ( $flags & ( 2**$bit ) ) || $defaulton ) {
+ $userflags->{$flag} = 1;
}
}
return $userflags;
}
sub haspermission {
- my ($dbh, $userid, $flagsrequired) = @_;
- my $sth=$dbh->prepare("SELECT cardnumber FROM borrowers WHERE userid=?");
+ 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);
+ ($cardnumber) || ( $cardnumber = $userid );
+ my $flags = getuserflags( $cardnumber, $dbh );
my $configfile;
- if ($userid eq C4::Context->config('user')) {
+ if ( $userid eq C4::Context->config('user') ) {
+
# Super User Account from /etc/koha.conf
- $flags->{'superlibrarian'}=1;
+ $flags->{'superlibrarian'} = 1;
}
- if ($userid eq 'demo' && C4::Context->config('demo')) {
+ if ( $userid eq 'demo' && C4::Context->config('demo') ) {
+
# Demo user that can do "anything" (demo=1 in /etc/koha.conf)
- $flags->{'superlibrarian'}=1;
+ $flags->{'superlibrarian'} = 1;
}
return $flags if $flags->{superlibrarian};
- foreach (keys %$flagsrequired) {
+ foreach ( keys %$flagsrequired ) {
return $flags if $flags->{$_};
}
return 0;
@@ -655,11 +755,11 @@
sub getborrowernumber {
my ($userid) = @_;
my $dbh = C4::Context->dbh;
- for my $field ('userid', 'cardnumber') {
- my $sth=$dbh->prepare
- ("select borrowernumber from borrowers where $field=?");
+ for my $field ( 'userid', 'cardnumber' ) {
+ my $sth =
+ $dbh->prepare("select borrowernumber from borrowers where $field=?");
$sth->execute($userid);
- if ($sth->rows) {
+ if ( $sth->rows ) {
my ($bnumber) = $sth->fetchrow;
return $bnumber;
}
More information about the Koha-cvs
mailing list