--- loncom/auth/lonauth.pm 2000/10/02 19:43:49 1.11 +++ loncom/auth/lonauth.pm 2001/07/28 15:57:48 1.21 @@ -3,17 +3,22 @@ # 5/21/99,5/22,5/25,5/26,5/27,5/29,6/2,6/11,6/14,6/15 # 16/11,12/16, # 1/14,2/24,2/28,2/29,3/7,5/29,5/30,5/31,6/1,6/5,6/29, -# 7/1,7/10,10/2 Gerd Kortemeyer +# 7/1,7/10,10/2,10/5,10/9,10/26,10/30,11/10, +# 05/28,05/29 Gerd Kortemeyer +# 07/24 Scott Harrison +# 07/28 Gerd Kortemeyer package Apache::lonauth; +use strict; use Apache::Constants qw(:common); use Apache::File; use CGI qw(:standard); use CGI::Cookie(); use Crypt::DES; use Apache::lonnet(); - +use Apache::lonmenu(); +use Fcntl qw(:flock); # ------------------------------------------------------------ Successful login sub success { @@ -21,13 +26,19 @@ sub success { my $lonids=$r->dir_config('lonIDsDir'); # See if old ID present, if so, remove - my $cookie; - while ($cookie=<$lonids/$username\_*\_$domain\_$authhost.id>) { - unlink($cookie); + + my $filename; + opendir(DIR,$lonids); + while ($filename=readdir(DIR)) { + if ($filename=~/^$username\_\d+\_$domain\_$authhost\.id$/) { + unlink($lonids.'/'.$filename); + } } + closedir(DIR); # Give them a new cookie + my $cookie; my $now=time; $cookie="$username\_$now\_$domain\_$authhost"; @@ -81,6 +92,12 @@ sub success { { my $idf=Apache::File->new(">$lonids/$cookie.id"); + unless (flock($idf,LOCK_EX)) { + &Apache::lonnet::logthis("WARNING: ". + 'Could not obtain exclusive lock in lonauth: '.$!); + $idf->close(); + return 'error: '.$!; + } if ($userenv ne '') { print $idf "$userenv\n"; } print $idf "user.name=$username\n"; print $idf "user.domain=$domain\n"; @@ -89,18 +106,36 @@ sub success { print $idf "browser.version=$clientversion\n"; print $idf "browser.mathml=$clientmathml\n"; print $idf "browser.os=$clientos\n"; + print $idf "request.course.fn=\n"; + print $idf "request.course.uri=\n"; + print $idf "request.course.sec=\n"; + print $idf "request.role=cm\n"; + print $idf "request.host=$ENV{'HTTP_HOST'}\n"; if ($userroles ne '') { print $idf "$userroles"; } + $idf->close(); } - + $ENV{'request.role'}='cm'; # -------------------------------------------------------------------- Log this &Apache::lonnet::log($domain,$username,$authhost, "Login $ENV{'REMOTE_ADDR'}"); +# ------------------------------------------------- Check for critical messages + + my @what=&Apache::lonnet::dump('critical',$domain,$username); + if ($what[0]) { + if ($what[0] ne 'con_lost') { + $lowerurl='/adm/email?critical=display'; + } + } + # ------------------------------------------------------------ Get cookie ready $cookie="lonID=$cookie; path=/"; - +# -------------------------------------------------------- Menu script and info + my $windowinfo=&Apache::lonmenu::open(); +# ------------------------------------------------------------- Info for Remote + my $configmenu=&Apache::lonmenu::rawconfig(); # ------------------------------------------------- Output for successful login $r->send_cgi_header(< Successful Login to the LearningOnline Network with CAPA - + +$windowinfo

Welcome!

+ ENDSUCCESS @@ -210,7 +279,7 @@ sub handler { return OK; } - if ($firsturl eq '') { + if (($firsturl eq '') || ($firsturl eq '/adm/logout')) { $firsturl='/res/adm/pages/index.html'; }