[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/C4 Auth.pm,1.25,1.26
|
From: |
Paul POULAIN |
|
Subject: |
[Koha-cvs] CVS: koha/C4 Auth.pm,1.25,1.26 |
|
Date: |
Fri, 02 May 2003 06:05:13 -0700 |
Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1:/tmp/cvs-serv10882/C4
Modified Files:
Auth.pm
Log Message:
Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** Auth.pm 19 Mar 2003 21:03:32 -0000 1.25
--- Auth.pm 2 May 2003 13:05:08 -0000 1.26
***************
*** 109,130 ****
sub get_template_and_user {
! my $in = shift;
! my $template = gettemplate($in->{'template_name'}, $in->{'type'});
! my ($user, $cookie, $sessionID, $flags)
! = checkauth($in->{'query'}, $in->{'authnotrequired'},
$in->{'flagsrequired'}, $in->{'type'});
!
! my $borrowernumber;
! if ($user) {
! $template->param(loggedinuser => $user);
! $template->param(sessionID => $sessionID);
!
! $borrowernumber = getborrowernumber($user);
! my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
! my @bordat;
! $bordat[0] = $borr;
!
! $template->param(USER_INFO => address@hidden);
! }
! return ($template, $borrowernumber, $cookie);
}
--- 109,130 ----
sub get_template_and_user {
! my $in = shift;
! my $template = gettemplate($in->{'template_name'}, $in->{'type'});
! my ($user, $cookie, $sessionID, $flags)
! = checkauth($in->{'query'}, $in->{'authnotrequired'},
$in->{'flagsrequired'}, $in->{'type'});
!
! my $borrowernumber;
! if ($user) {
! $template->param(loggedinuser => $user);
! $template->param(sessionID => $sessionID);
!
! $borrowernumber = getborrowernumber($user);
! my ($borr, $flags) = getpatroninformation(undef,
$borrowernumber);
! my @bordat;
! $bordat[0] = $borr;
!
! $template->param(USER_INFO => address@hidden);
! }
! return ($template, $borrowernumber, $cookie);
}
***************
*** 191,340 ****
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 = 120 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);
! 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')) {
! my ($ip , $lasttime);
! ($userid, $ip, $lasttime) = $dbh->selectrow_array(
! "SELECT userid,ip,lasttime FROM sessions WHERE
sessionid=?",
! undef, $sessionID);
! if ($logout) {
! warn "In logout!\n";
! # voluntary logout the user
! $dbh->do("DELETE FROM sessions WHERE sessionID=?", undef,
$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);
- $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);
! $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');
! 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;
! }
! } else {
! if ($userid) {
! $info{'invalid_username_or_password'} = 1;
! }
! }
! }
! 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 => '');
! }
! 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 $template = gettemplate($template_name, $type);
! $template->param(INPUTS => address@hidden);
! $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 => guesstype($template->output),
! -cookie => $cookie
! ), $template->output;
! exit;
}
--- 191,339 ----
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 = 120 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);
! 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')) {
! 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);
$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);
! $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);
! $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');
! 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;
! }
! } else {
! if ($userid) {
! $info{'invalid_username_or_password'} = 1;
! }
}
}
! 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 => '');
! }
! 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 $template = gettemplate($template_name, $type);
! $template->param(INPUTS => address@hidden);
! $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 => guesstype($template->output),
! -cookie => $cookie
! ), $template->output;
! exit;
}
***************
*** 349,358 ****
#
my ($dbh, $userid, $password) = @_;
- warn "$userid / $password";
my $sth=$dbh->prepare("select password,cardnumber from borrowers where
userid=?");
$sth->execute($userid);
if ($sth->rows) {
my ($md5password,$cardnumber) = $sth->fetchrow;
- warn "==> ".md5_base64($password)." = $md5password";
if (md5_base64($password) eq $md5password) {
return 1,$cardnumber;
--- 348,355 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/C4 Auth.pm,1.25,1.26,
Paul POULAIN <=