--- loncom/auth/lonauth.pm	2005/07/07 06:18:37	1.69
+++ loncom/auth/lonauth.pm	2006/09/19 21:36:24	1.83
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.69 2005/07/07 06:18:37 albertel Exp $
+# $Id: lonauth.pm,v 1.83 2006/09/19 21:36:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,8 +29,8 @@
 package Apache::lonauth;
 
 use strict;
+use LONCAPA;
 use Apache::Constants qw(:common);
-use Apache::File;
 use CGI qw(:standard);
 use CGI::Cookie();
 use DynaLoader; # for Crypt::DES version
@@ -40,13 +40,13 @@ use Apache::lonnet;
 use Apache::lonmenu();
 use Fcntl qw(:flock);
 use Apache::lonlocal;
-
+use GDBM_File;
 my %FORM;
 
 # ------------------------------------------------------------ Successful login
 
 sub success {
-    my ($r, $username, $domain, $authhost,$lowerurl) = @_;
+    my ($r, $username, $domain, $authhost, $lowerurl, $extra_env) = @_;
     my $lonids=$r->dir_config('lonIDsDir');
 
     my $public=($username eq 'public' && $domain eq 'public');
@@ -88,7 +88,7 @@ sub success {
     
 # Initialize roles
 
-	$userroles=Apache::lonnet::rolesinit($domain,$username,$authhost);
+	$userroles=&Apache::lonnet::rolesinit($domain,$username,$authhost);
     }
 # ------------------------------------ Check browser type and MathML capability
 
@@ -109,13 +109,13 @@ sub success {
     }
 # ------------------------------------------------------------- Get environment
 
-    my $userenv;
     my %userenv=Apache::lonnet::dump('environment',$domain,$username);
     my ($tmp) = keys(%userenv);
     if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
-	foreach my $key (keys(%userenv)) {
-	    $userenv.="environment.$key=$userenv{$key}\n";
-	}
+	# default remote control to off
+	if ($userenv{'remote'} ne 'on') { $userenv{'remote'} = 'off'; }
+    } else {
+	undef(%userenv);
     }
     if (($userenv{'interface'}) && (!$FORM{'interface'})) {
 	$FORM{'interface'}=$userenv{'interface'};
@@ -132,49 +132,58 @@ sub success {
 # --------------------------------------------------------- Write first profile
 
     {
-	my $idf=Apache::File->new(">$lonids/$cookie.id");
-	unless (flock($idf,LOCK_EX)) {
-	    &Apache::lonnet::logthis("<font color=blue>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";
-	print $idf "user.home=$authhost\n";
-	print $idf "browser.type=$clientbrowser\n";
-	print $idf "browser.version=$clientversion\n";
-	print $idf "browser.mathml=$clientmathml\n";
-	print $idf "browser.unicode=$clientunicode\n";
-	print $idf "browser.os=$clientos\n";
+	my %initial_env = 
+	    ("user.name"          => $username,
+	     "user.domain"        => $domain,
+	     "user.home"          => $authhost,
+	     "browser.type"       => $clientbrowser,
+	     "browser.version"    => $clientversion,
+	     "browser.mathml"     => $clientmathml,
+	     "browser.unicode"    => $clientunicode,
+	     "browser.os"         => $clientos,
+	     "server.domain"      => $r->dir_config('lonDefDomain'),
+	     "request.course.fn"  => '',
+	     "request.course.uri" => '',
+	     "request.course.sec" => '',
+	     "request.role"       => 'cm',
+	     "request.role.adv"   => $env{'user.adv'},
+	     "request.host"       => $ENV{'REMOTE_ADDR'},);
+
         if ($FORM{'localpath'}) {
-           print $idf "browser.localpath=$FORM{'localpath'}\n";
-           print $idf "browser.localres=$FORM{'localres'}\n";
+	    $initial_env{"browser.localpath"}  = $FORM{'localpath'};
+	    $initial_env{"browser.localres"}   = $FORM{'localres'};
         }
-	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.role.adv=$env{'user.adv'}\n";
-	print $idf "request.host=$ENV{'REMOTE_ADDR'}\n";
+	
 	if ($public) {
-	    print $idf "environment.remote=off\n";
+	    $initial_env{"environment.remote"} = "off";
 	}
 	if ($FORM{'interface'}) {
 	    $FORM{'interface'}=~s/\W//gs;
-	    print $idf "browser.interface=$FORM{'interface'}\n";
+	    $initial_env{"browser.interface"} = $FORM{'interface'};
 	    $env{'browser.interface'}=$FORM{'interface'};
-	    foreach ('imagesuppress','appletsuppress',
-		     'embedsuppress','fontenhance','blackwhite') {
-		if (($FORM{$_} eq 'true') ||
-		    ($userenv{$_} eq 'on')) {
-		    print $idf "browser.$_=on\n";
+	    foreach my $option ('imagesuppress','appletsuppress',
+				'embedsuppress','fontenhance','blackwhite') {
+		if (($FORM{$option} eq 'true') ||
+		    ($userenv{$option} eq 'on')) {
+		    $initial_env{"browser.$option"} = "on";
 		}
 	    }
 	}
-	if ($userroles ne '') { print $idf "$userroles"; }
-	$idf->close();
+
+	$env{'user.environment'} = "$lonids/$cookie.id";
+	
+	if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id",
+		 &GDBM_WRCREAT(),0640)) {
+	    &add_to_env(\%disk_env,\%initial_env);
+	    &add_to_env(\%disk_env,\%userenv,'environment.');
+	    &add_to_env(\%disk_env,$userroles);
+	    &add_to_env(\%disk_env,$extra_env);
+	    untie(%disk_env);
+	} else {
+	    &Apache::lonnet::logthis("<font color=blue>WARNING: ".
+			   'Could not create environment storage in lonauth: '.$!);
+	    return 'error: '.$!;
+	}
     }
     $env{'request.role'}='cm';
     $env{'request.role.adv'}=$env{'user.adv'};
@@ -195,7 +204,8 @@ sub success {
 
 # ------------------------------------------------------------ Get cookie ready
 
-    if ($public) { return $cookie; }
+    if ($public or $lowerurl eq 'noredirect') { return $cookie; }
+
     $cookie="lonID=$cookie; path=/";
 # -------------------------------------------------------- Menu script and info
     my $windowinfo=&Apache::lonmenu::open($clientos);
@@ -203,8 +213,11 @@ sub success {
     my $remoteinfo=&Apache::lonmenu::load_remote_msg($lowerurl);
     my $setflags=&Apache::lonmenu::setflags();
     my $maincall=&Apache::lonmenu::maincall();
-    my $bodytag=&Apache::loncommon::bodytag('Successful Login');
-    my $add=&addcontent();
+    my $start_page=&Apache::loncommon::start_page('Successful Login',
+						  $startupremote,
+						  {'no_inline_link' => 1,});
+    my $end_page  =&Apache::loncommon::end_page();
+
     my $continuelink;
     if (($env{'browser.interface'} eq 'textual') ||
         ($env{'environment.remote'} eq 'off')) {
@@ -212,11 +225,10 @@ sub success {
     }
 # ------------------------------------------------- Output for successful login
 
-    $r->send_cgi_header(<<ENDHEADER);
-Content-type: text/html$add
-Set-cookie: $cookie
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->header_out('Set-cookie' => $cookie);
+    $r->send_http_header;
 
-ENDHEADER
     my %lt=&Apache::lonlocal::texthash(
 				       'wel' => 'Welcome',
 				       'mes' => 'Welcome to the Learning<i>Online</i> Network with CAPA. Please wait while your session is being set up',
@@ -224,12 +236,7 @@ ENDHEADER
 				       'log' => 'loginproblems.html',
 				       );
     $r->print(<<ENDSUCCESS);
-<html>
-<head>
-<title>Successful Login to the LearningOnline Network with CAPA</title>
-$startupremote
-</head>
-$bodytag
+$start_page
 $setflags
 $windowinfo
 <h1>$lt{'wel'}</h1>
@@ -238,68 +245,57 @@ $lt{'mes'}.<p>
 $remoteinfo
 $maincall
 $continuelink
-</body>
-</html>
+$end_page
 ENDSUCCESS
 }
 
+sub add_to_env {
+    my ($idf,$env_data,$prefix) = @_;
+    while (my ($key,$value) = each(%$env_data)) {
+	$idf->{$prefix.$key} = $value;
+	$env{$prefix.$key}   = $value;
+    }
+}
+
 # --------------------------------------------------------------- Failed login!
 
 sub failed {
     my ($r,$message) = @_;
-    my $bodytag=&Apache::loncommon::bodytag('Unsuccessful Login');
-    my $add=&addcontent();
-    $r->send_cgi_header(<<ENDFHEADER);
-Content-type: text/html$add
+    my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,
+						    {'no_inline_link' => 1,});
+    my $end_page   = &Apache::loncommon::end_page();
+
+    my %lt=('sorry'  => &mt('Sorry ...'),
+	    'please' => 
+	    &mt('Please [_1]log in again[_2].',
+		"<a href=\"/adm/login?username=$FORM{'uname'}&domain=$FORM{'udom'}\">",
+		'</a>'),
+	    'problemspage' => &mt('loginproblems.html'),
+	    'problems'     => 'Problems',
+	    );
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
 
-ENDFHEADER
     $r->print(<<ENDFAILED);
-<html>
-<head>
-<title>Unsuccessful Login to the LearningOnline Network with CAPA</title>
-</head>
-$bodytag
-<h1>Sorry ...</h1>
+$start_page
+<h1>$lt{'sorry'}</h1>
 <p><b>$message</b></p>
-<p>Please <a href="/adm/login?username=$FORM{'uname'}&domain=$FORM{'udom'}">log in again</a>.</p>
+<p>$lt{'please'}</p>
 <p>
-<a href="/adm/loginproblems.html">Problems?</a></p>
-</body>
-</html>
+<a href="/adm/$lt{'problemspage'}">$lt{'problems'}</a></p>
+$end_page
 ENDFAILED
 }
 
-# --------------------------------------------------------------------- Charset
-
-sub addcontent {
-    my $encoding=&Apache::lonlocal::current_encoding;
-    if ($encoding) {
-	return '; charset='.$encoding;
-    } else {
-	return '';
-    }
-}
-
 # ------------------------------------------------------------------ Rerouting!
 
 sub reroute {
-    my $r=shift;
-    my $bodytag=&Apache::loncommon::bodytag('Rerouting');
-    $r->send_cgi_header(<<ENDRFHEADER);
-Content-type: text/html
-
-ENDRFHEADER
-    $r->print(<<ENDRFAILED);
-<html>
-<head>
-<title>Rerouting Login to the LearningOnline Network with CAPA</title>
-</head>
-$bodytag
-<h1>Sorry ...</h1>
-Please <a href="/">log in again</a>.
-</body>
-</html>
-ENDRFAILED
+    my ($r) = @_;
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
+    my $msg='<h1>Sorry ...</h1>
+             Please <a href="/">log in again</a>.';
+    &Apache::loncommon::simple_error_page($r,'Rerouting',$msg);
 }
 
 # ---------------------------------------------------------------- Main handler
@@ -325,24 +321,20 @@ sub handler {
         my $lonidsdir=$r->dir_config('lonIDsDir');
         if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
 # Indeed, a valid token is found
-	    $r->send_cgi_header(<<ENDFHEADER);
-Content-type: text/html
-
-ENDFHEADER
-	    my $bodytag=&Apache::loncommon::bodytag('Already logged in');
+	    &Apache::loncommon::content_type($r,'text/html');
+	    $r->send_http_header;
+	    my $start_page = 
+		&Apache::loncommon::start_page('Already logged in');
+	    my $end_page = 
+		&Apache::loncommon::end_page();
 	    $r->print(<<ENDFAILED);
-<html>
-<head>
-<title>Already logged in</title>
-</head>
-$bodytag
+$start_page
 <h1>You are already logged in</h1>
 <p>Please either <a href="/adm/roles">continue the current session</a> or
 <a href="/adm/logout">logout</a>.</p>
 <p>
 <a href="/adm/loginproblems.html">Problems?</a></p>
-</body>
-</html>
+$end_page
 ENDFAILED
            return OK;
 	}
@@ -389,9 +381,12 @@ ENDFAILED
 	failed($r,'Information needed to verify your login information is missing, inaccessible or expired.');
         return OK;
     } else {
-        unless (&Apache::lonnet::reply('tmpdel:'.$FORM{'logtoken'},
-                                         $FORM{'serverid'}) eq 'ok') {
+	my $reply = &Apache::lonnet::reply('tmpdel:'.$FORM{'logtoken'},
+					   $FORM{'serverid'});
+        if ( $reply ne 'ok' ) {
             &failed($r,'Session could not be opened.');
+	    &Apache::lonnet::logthis("ERROR got a reply of $reply when trying to contact ". $FORM{'serverid'}." to get login token");
+	    return OK;
 	}
     }
     my ($key,$firsturl)=split(/&/,$tmpinfo);
@@ -455,7 +450,12 @@ ENDFAILED
 	    &Apache::lonnet::logthis('Non-privileged user attempting switch user');
 	}
     }
-    &success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$firsturl);
+    if ($r->dir_config("lonBalancer") eq 'yes') {
+	&success($r,$FORM{'uname'},$FORM{'udom'},$authhost,'noredirect');
+	$r->internal_redirect('/adm/switchserver');
+    } else {
+	&success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$firsturl);
+    }
     return OK;
 }