--- loncom/auth/lonauth.pm 2000/05/31 13:27:28 1.6 +++ loncom/auth/lonauth.pm 2000/10/02 19:43:49 1.11 @@ -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 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 Gerd Kortemeyer package Apache::lonauth; @@ -10,6 +11,7 @@ use Apache::Constants qw(:common); use Apache::File; use CGI qw(:standard); use CGI::Cookie(); +use Crypt::DES; use Apache::lonnet(); # ------------------------------------------------------------ Successful login @@ -33,7 +35,7 @@ sub success { my $userroles=Apache::lonnet::rolesinit($domain,$username,$authhost); -# Check browser type and MathML capability +# ------------------------------------ Check browser type and MathML capability my @browsertype=split(/\&/,$r->dir_config("lonBrowsDet")); my %mathcap=split(/\&/,$r->dir_config("lonMathML")); @@ -61,12 +63,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'; } -# Write first profile +# ------------------------------------------------------------- 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,9 +89,14 @@ 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" }; + if ($userroles ne '') { print $idf "$userroles"; } } +# -------------------------------------------------------------------- Log this + + &Apache::lonnet::log($domain,$username,$authhost, + "Login $ENV{'REMOTE_ADDR'}"); + # ------------------------------------------------------------ Get cookie ready $cookie="lonID=$cookie; path=/"; @@ -95,6 +115,10 @@ ENDHEADER +

Welcome!

@@ -134,6 +158,8 @@ sub handler { my $pair; my $name; my $value; my %FORM; foreach $pair (@pairs) { ($name,$value) = split(/=/,$pair); + $value =~ tr/+/ /; + $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; $FORM{$name}=$value; } @@ -148,9 +174,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? @@ -160,14 +210,15 @@ sub handler { return OK; } - my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); - my $lonurl=$cookies{'lonURL'}; - if (!$lonurl) { failed($r,'Cookies need to be activated'); return OK; } - my $lowerurl=$lonurl->value; + if ($firsturl eq '') { + $firsturl='/res/adm/pages/index.html'; + } - success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$lowerurl); + success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$firsturl); return OK; } 1; __END__ + +