--- loncom/auth/lonauth.pm	2000/02/29 16:24:00	1.5
+++ 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 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,12 +11,14 @@ 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
 
 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,20 +36,88 @@ 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";
+            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(<<ENDHEADER);
@@ -58,11 +129,12 @@ ENDHEADER
 <html>
 <head>
 <title>Successful Login to the LearningOnline Network with CAPA</title>
+<meta HTTP-EQUIV="Refresh" CONTENT="1; url=$lowerurl">
 </head>
-<frameset rows="80,*" border=0>
-<frame scrolling="no" name="loncontrol" src="/adm/menu">
-<frame name="loncontent" src="/adm/roles">
-</frameset>
+<body bgcolor="#FFFFFF">
+    $windowinfo
+<h1>Welcome!</h1>
+</body>
 </html>
 ENDSUCCESS
 }
@@ -100,6 +172,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;
     } 
 
@@ -108,16 +182,39 @@ sub handler {
         return OK;
     }
     $FORM{'uname'} =~ s/\W//g;
-    $FORM{'upass'} =~ s/\W//g;
     $FORM{'udom'}  =~ s/\W//g;
 
     my $role   = $r->dir_config('lonRole');
     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?
@@ -127,14 +224,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 eq '/adm/logout')) {
+	$firsturl='/res/adm/pages/index.html';
+    }
 
-    success($r,$FORM{'uname'},$FORM{'udom'},$authhost);
+    success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$firsturl);
     return OK;
 }
 
 1;
 __END__
+
+