--- loncom/auth/lonauth.pm 2010/07/24 17:42:46 1.107 +++ loncom/auth/lonauth.pm 2012/12/18 20:53:33 1.121.2.3 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.107 2010/07/24 17:42:46 raeburn Exp $ +# $Id: lonauth.pm,v 1.121.2.3 2012/12/18 20:53:33 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,6 +40,7 @@ use Apache::lonmenu(); use Apache::createaccount; use Fcntl qw(:flock); use Apache::lonlocal; +use Apache::File(); use HTML::Entities; # ------------------------------------------------------------ Successful login @@ -81,9 +82,13 @@ sub success { my $now=time; my $then=$env{'user.login.time'}; my $refresh=$env{'user.refresh.time'}; + my $update=$env{'user.update.time'}; + if (!$update) { + $update = $then; + } if (exists($env{$envkey})) { my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus); - &Apache::lonnet::role_status($envkey,$then,$refresh,$now,\$role,\$where, + &Apache::lonnet::role_status($envkey,$update,$refresh,$now,\$role,\$where, \$trolecode,\$tstatus,\$tstart,\$tend); if ($tstatus eq 'is') { $destination .= ($destination =~ /\?/) ? '&' : '?'; @@ -98,7 +103,7 @@ sub success { if ($destsymb =~ /___/) { # FIXME Need to deal with encrypted symbs and urls as needed. my ($map,$resid,$desturl)=split(/___/,$destsymb); - unless ($desturl=~/^(adm|uploaded|editupload|public)/) { + unless ($desturl=~/^(adm|editupload|public)/) { $desturl = &Apache::lonnet::clutter($desturl); } $desturl = &HTML::Entities::encode($desturl,'"<>&'); @@ -110,17 +115,28 @@ sub success { $destination .= '&destinationurl='.$destsymb; } } + if ($destination =~ m{^/adm/roles}) { + $destination .= ($destination =~ /\?/) ? '&' : '?'; + $destination .= 'source=login'; + } - my $windowinfo = Apache::lonhtmlcommon::scripttag('self.name="loncapaclient";'); - my $header = ''; + my $windowinfo=&Apache::lonmenu::open($env{'browser.os'}); + my $startupremote=&Apache::lonmenu::startupremote($destination); + my $remoteinfo=&Apache::lonmenu::load_remote_msg($lowerurl); + my $setflags=&Apache::lonmenu::setflags(); + my $maincall=&Apache::lonmenu::maincall(); my $brcrum = [{'href' => '', 'text' => 'Successful Login'},]; my $start_page=&Apache::loncommon::start_page('Successful Login', - $header, - {'bread_crumbs' => $brcrum,}); + $startupremote, + {'no_inline_link' => 1, + 'bread_crumbs' => $brcrum,}); my $end_page =&Apache::loncommon::end_page(); - my $continuelink=''.&mt('Continue').''; + my $continuelink; + if ($env{'environment.remote'} eq 'off') { + $continuelink=''.&mt('Continue').''; + } # ------------------------------------------------- Output for successful login &Apache::loncommon::content_type($r,'text/html'); @@ -129,16 +145,23 @@ sub success { my %lt=&Apache::lonlocal::texthash( 'wel' => 'Welcome', - 'mes' => 'Welcome to the LearningOnline Network with CAPA. Please wait while your session is being set up.', 'pro' => 'Login problems?', - 'log' => 'loginproblems.html', ); + my $loginhelp = &loginhelpdisplay($domain); + if ($loginhelp) { + $loginhelp = '

'.$lt{'pro'}.'

'; + } + + my $welcome = &mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','',''); $r->print(<$lt{'wel'} -$lt{'mes'}

-$lt{'pro'}

+$welcome +$loginhelp +$remoteinfo +$maincall $continuelink $end_page ENDSUCCESS @@ -160,13 +183,18 @@ sub failed { my $end_page = &Apache::loncommon::end_page(); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; + my $loginhelp = &loginhelpdisplay($form->{'udom'}); + if ($loginhelp) { + $loginhelp = '

'.&mt('Login problems?').'

'; + } + $r->print( $start_page .'

'.&mt('Sorry ...').'

' .'

'.&mt($message).'

' .'

'.&mt('Please [_1]log in again[_2].','','') .'

' - .'

'.&mt('Login problems?').'

' + .$loginhelp .$end_page ); } @@ -186,9 +214,10 @@ sub reroute { sub handler { my $r = shift; + my $londocroot = $r->dir_config('lonDocRoot'); my $form; # Are we re-routing? - if (-e '/home/httpd/html/lon-status/reroute.txt') { + if (-e "$londocroot/lon-status/reroute.txt") { &reroute($r); return OK; } @@ -217,7 +246,7 @@ sub handler { } $r->print( $start_page - .'

'.&mt('You are already logged in!').'

' + .'

' .'

'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].' ,'','','','') .'

' @@ -265,7 +294,8 @@ sub handler { my $tmpinfo=Apache::lonnet::reply('tmpget:'.$form{'logtoken'}, $form{'serverid'}); - if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) { + if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost') || + ($tmpinfo eq 'no_such_host')) { &failed($r,'Information needed to verify your login information is missing, inaccessible or expired.',\%form); return OK; } else { @@ -319,21 +349,15 @@ sub handler { } # ---------------------------------------------------------------- Authenticate - my @cancreate; + my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$form{'udom'}); - if (ref($domconfig{'usercreation'}) eq 'HASH') { - if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') { - if (ref($domconfig{'usercreation'}{'cancreate'}{'selfcreate'}) eq 'ARRAY') { - @cancreate = @{$domconfig{'usercreation'}{'cancreate'}{'selfcreate'}}; - } elsif (($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne 'none') && - ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne '')) { - @cancreate = ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'}); - } - } - } + my ($cancreate,$statustocreate) = + &Apache::createaccount::get_creation_controls($form{'udom'},$domconfig{'usercreation'}); my $defaultauth; - if (grep(/^login$/,@cancreate)) { - $defaultauth = 1; + if (ref($cancreate) eq 'ARRAY') { + if (grep(/^login$/,@{$cancreate})) { + $defaultauth = 1; + } } my $clientcancheckhost = 1; my $authhost=Apache::lonnet::authenticate($form{'uname'},$upass, @@ -347,22 +371,25 @@ sub handler { \%form); return OK; } elsif ($authhost eq 'no_account_on_host') { - my %domconfig = - &Apache::lonnet::get_dom('configuration',['usercreation'],$form{'udom'}); - if (grep(/^login$/,@cancreate)) { + if ($defaultauth) { my $domdesc = &Apache::lonnet::domain($form{'udom'},'description'); - &check_can_host($r,\%form,'no_account_on_host',$domdesc); + unless (&check_can_host($r,\%form,'no_account_on_host',$domdesc)) { + return OK; + } my $start_page = - &Apache::loncommon::start_page('Create a user account in LON-CAPA'); + &Apache::loncommon::start_page('Create a user account in LON-CAPA', + '',{'no_inline_link' => 1,}); my $lonhost = $r->dir_config('lonHostID'); my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; my $contacts = &Apache::loncommon::build_recipient_list(undef,'helpdeskmail', $form{'udom'},$origmail); my ($contact_email) = split(',',$contacts); - my $output = &Apache::createaccount::username_check($form{'uname'}, - $form{'udom'},$domdesc,'', - $lonhost,$contact_email,$contact_name); + my $output = + &Apache::createaccount::username_check($form{'uname'},$form{'udom'}, + $domdesc,'',$lonhost, + $contact_email,$contact_name, + undef,$statustocreate); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; &Apache::createaccount::print_header($r,$start_page); @@ -403,18 +430,64 @@ sub handler { } } - &check_can_host($r,\%form,$authhost); + my ($is_balancer,$otherserver) = + &Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'}); - if ($r->dir_config("lonBalancer") eq 'yes') { - &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef, - \%form); - my ($otherserver) = &Apache::lonnet::choose_server($form{'udom'}); - $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver); + if ($is_balancer) { + if (!$otherserver) { + ($otherserver) = &Apache::lonnet::choose_server($form{'udom'}); + } + if ($otherserver) { + &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef, + \%form); + $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl); + } else { + $r->print(&noswitch()); + } + return OK; } else { - &success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,undef, - \%form); + if (!&check_can_host($r,\%form,$authhost)) { + my ($otherserver) = &Apache::lonnet::choose_server($form{'udom'}); + if ($otherserver) { + &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef, + \%form); + $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl); + } else { + $r->print(&noswitch()); + } + return OK; + } + +# ------------------------------------------------------- Do the load balancing + +# ---------------------------------------------------------- Determine own load + my $loadlim = $r->dir_config('lonLoadLim'); + my $loadavg; + { + my $loadfile=Apache::File->new('/proc/loadavg'); + $loadavg=<$loadfile>; + } + $loadavg =~ s/\s.*//g; + my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim); + my $userloadpercent=&Apache::lonnet::userload(); + +# ---------------------------------------------------------- Are we overloaded? + if ((($userloadpercent>100.0)||($loadpercent>100.0))) { + my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent,1,$form{'udom'}); + if (!$unloaded) { + ($unloaded) = &Apache::lonnet::choose_server($form{'udom'}); + } + if ($unloaded) { + &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect', + undef,\%form); + $r->internal_redirect('/adm/switchserver?otherserver='.$unloaded.'&origurl='.$firsturl); + return OK; + } + } + &success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,undef, + \%form); + return OK; } - return OK; } sub check_can_host { @@ -423,7 +496,11 @@ sub check_can_host { my $canhost = 1; my $lonhost = $r->dir_config('lonHostID'); my $udom = $form->{'udom'}; - my @intdoms = &Apache::lonnet::get_internet_names($lonhost); + my @intdoms; + my $internet_names = &Apache::lonnet::get_internet_names($lonhost); + if (ref($internet_names) eq 'ARRAY') { + @intdoms = @{$internet_names}; + } my $uprimary_id = &Apache::lonnet::domain($udom,'primary'); my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id); unless ($uint_dom ne '' && grep(/^\Q$uint_dom\E$/,@intdoms)) { @@ -445,7 +522,9 @@ sub check_can_host { } unless ($canhost) { if ($authhost eq 'no_account_on_host') { - my ($login_host,$hostname) = &Apache::lonnet::choose_server($udom); + my $checkloginvia = 1; + my ($login_host,$hostname) = + &Apache::lonnet::choose_server($udom,$checkloginvia); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; if ($login_host ne '') { @@ -465,7 +544,6 @@ sub check_can_host { '

'.&mt('Currently a LON-CAPA server is not available within the [_1] domain for you to log-in to, to create an account.',$domdesc).'

'. &Apache::loncommon::end_page()); } - return OK; } else { &success($r,$form->{'uname'},$udom,$authhost,'noredirect',undef, $form); @@ -473,6 +551,43 @@ sub check_can_host { $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver); } } + return $canhost; +} + +sub noswitch { + my $result = &Apache::loncommon::start_page('Access to LON-CAPA unavailable'). + '

'.&mt('Session unavailable').'

'. + &mt('This LON-CAPA server is unable to host your session.').'
'. + '

'.&mt('Currently no other LON-CAPA server is available to host your session either.').'

'. + &Apache::loncommon::end_page(); + return $result; +} + +sub loginhelpdisplay { + my ($authdomain) = @_; + my $login_help = 1; + my $lang = &Apache::lonlocal::current_language(); + if ($login_help) { + my $dom = $authdomain; + if ($dom eq '') { + $dom = &Apache::lonnet::default_login_domain(); + } + my %domconfhash = &Apache::loncommon::get_domainconf($dom); + my $loginhelp_url; + if ($lang) { + $loginhelp_url = $domconfhash{$dom.'.login.helpurl_'.$lang}; + if ($loginhelp_url ne '') { + return $loginhelp_url; + } + } + $loginhelp_url = $domconfhash{$dom.'.login.helpurl_nolang'}; + if ($loginhelp_url ne '') { + return $loginhelp_url; + } else { + return '/adm/loginproblems.html'; + } + } + return; } 1;