--- loncom/auth/lonauth.pm 2000/02/29 16:24:00 1.5 +++ 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 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,12 +11,13 @@ use Apache::Constants qw(:common); use Apache::File; use CGI qw(:standard); use CGI::Cookie(); +use Crypt::DES; use Apache::lonnet(); # ------------------------------------------------------------ Successful login sub success { - my ($r, $username, $domain, $authhost) = @_; + my ($r, $username, $domain, $authhost,$lowerurl) = @_; my $lonids=$r->dir_config('lonIDsDir'); # See if old ID present, if so, remove @@ -33,16 +35,68 @@ sub success { my $userroles=Apache::lonnet::rolesinit($domain,$username,$authhost); -# Write first profile +# ------------------------------------ Check browser type and MathML capability + + my @browsertype=split(/\&/,$r->dir_config("lonBrowsDet")); + my %mathcap=split(/\&/,$r->dir_config("lonMathML")); + my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; + my $i; + my $clientbrowser='unknown'; + my $clientversion='0'; + my $clientmathml=''; + for ($i=0;$i<=$#browsertype;$i++) { + my ($bname,$match,$notmatch,$vreg,$minv)=split(/\:/,$browsertype[$i]); + if (($httpbrowser=~/$match/i) && ($httpbrowser!~/$notmatch/i)) { + $clientbrowser=$bname; + $httpbrowser=~/$vreg/i; + $clientversion=$1; + $clientmathml=($clientversion>=$minv); + } + } + my $clientos='unknown'; + if (($httpbrowser=~/linux/i) || + ($httpbrowser=~/unix/i) || + ($httpbrowser=~/ux/i) || + ($httpbrowser=~/solaris/i)) { $clientos='unix'; } + if (($httpbrowser=~/vax/i) || + ($httpbrowser=~/vms/i)) { $clientos='vms'; } + if ($httpbrowser=~/next/i) { $clientos='next'; } + if (($httpbrowser=~/mac/i) || + ($httpbrowser=~/powerpc/i)) { $clientos='mac'; } + 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"; - if ($userroles ne '') { print $idf "$userroles" }; + print $idf "browser.type=$clientbrowser\n"; + print $idf "browser.version=$clientversion\n"; + print $idf "browser.mathml=$clientmathml\n"; + print $idf "browser.os=$clientos\n"; + 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=/"; @@ -58,11 +112,15 @@ ENDHEADER