--- loncom/auth/lonauth.pm 2000/06/05 20:28:17 1.7 +++ loncom/auth/lonauth.pm 2000/10/30 22:41:55 1.16 @@ -2,7 +2,8 @@ # User Authentication Module # 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 Gerd Kortemeyer +# 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,10/5,10/9,10/26,10/30 Gerd Kortemeyer package Apache::lonauth; @@ -10,7 +11,9 @@ use Apache::Constants qw(:common); use Apache::File; use CGI qw(:standard); use CGI::Cookie(); +use Crypt::DES; use Apache::lonnet(); +use Apache::lonmenu(); # ------------------------------------------------------------ Successful login @@ -61,12 +64,25 @@ sub success { if ($httpbrowser=~/next/i) { $clientos='next'; } if (($httpbrowser=~/mac/i) || ($httpbrowser=~/powerpc/i)) { $clientos='mac'; } - if ($httpbrowser=~/win/) { $clientos='win'; } + if ($httpbrowser=~/win/i) { $clientos='win'; } +# ------------------------------------------------------------- Get environment + + my $userenv=Apache::lonnet::reply("dump:$domain:$username:environment", + $authhost); + if (($userenv eq 'con_lost') || + ($userenv =~ /^error\:/)) { + $userenv=''; + } + $userenv=~s/\&/\nenvironment\./g; + if ($userenv ne '') { + $userenv='environment.'.$userenv; + } # --------------------------------------------------------- Write first profile { my $idf=Apache::File->new(">$lonids/$cookie.id"); + if ($userenv ne '') { print $idf "$userenv\n"; } print $idf "user.name=$username\n"; print $idf "user.domain=$domain\n"; print $idf "user.home=$authhost\n"; @@ -74,17 +90,34 @@ sub success { print $idf "browser.version=$clientversion\n"; print $idf "browser.mathml=$clientmathml\n"; print $idf "browser.os=$clientos\n"; - if ($userroles ne '') { print $idf "$userroles" }; + 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"; } } + # -------------------------------------------------------------------- Log this &Apache::lonnet::log($domain,$username,$authhost, "Login $ENV{'REMOTE_ADDR'}"); +# ------------------------------------------------- Check for critical messages + + my @what=&Apache::lonnet::dump('critical'); + if ($what[0]) { + if ($what[0] ne 'con_lost') { + $lowerurl='/adm/email/critical/'.$what[0]; + } + } + # ------------------------------------------------------------ Get cookie ready $cookie="lonID=$cookie; path=/"; +# -------------------------------------------------------- Menu script and info + my $windowinfo=&Apache::lonmenu::open(); # ------------------------------------------------- Output for successful login $r->send_cgi_header(< - + $windowinfo

Welcome!

@@ -158,9 +188,33 @@ sub handler { my $domain = $r->dir_config('lonDefDomain'); my $prodir = $r->dir_config('lonUsersDir'); +# ---------------------------------------- Get the information from login token + + my $tmpinfo=Apache::lonnet::reply('tmpget:'.$FORM{'logtoken'}, + $FORM{'serverid'}); + + if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) { + failed($r,'Login token missing, inaccessible or expired'); + return OK; + } + + my ($key,$firsturl)=split(/&/,$tmpinfo); + + my $keybin=pack("H16",$key); + + my $cipher=new DES $keybin; + + my $upass=$cipher->decrypt( + unpack("a8",pack("H16",substr($FORM{'upass'},0,16)))); + + $upass.=$cipher->decrypt( + unpack("a8",pack("H16",substr($FORM{'upass'},16,16)))); + + $upass=substr($upass,1,ord(substr($upass,0,1))); + # ---------------------------------------------------------------- Authenticate my $authhost=Apache::lonnet::authenticate($FORM{'uname'}, - $FORM{'upass'}, + $upass, $FORM{'udom'}); # --------------------------------------------------------------------- Failed? @@ -170,11 +224,11 @@ sub handler { return OK; } - if ($FORM{'firsturl'} eq '') { - $FORM{'firsturl'}='/res/index.html'; + if (($firsturl eq '') || ($firsturl eq '/adm/logout')) { + $firsturl='/res/adm/pages/index.html'; } - success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$FORM{'firsturl'}); + success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$firsturl); return OK; }