--- loncom/auth/lonauth.pm 2012/02/09 22:01:34 1.101.8.9.2.2 +++ loncom/auth/lonauth.pm 2010/03/17 17:51:06 1.103 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.101.8.9.2.2 2012/02/09 22:01:34 raeburn Exp $ +# $Id: lonauth.pm,v 1.103 2010/03/17 17:51:06 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,7 +40,6 @@ use Apache::lonmenu(); use Apache::createaccount; use Fcntl qw(:flock); use Apache::lonlocal; -use Apache::File(); use HTML::Entities; # ------------------------------------------------------------ Successful login @@ -82,13 +81,9 @@ 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,$update,$refresh,$now,\$role,\$where, + &Apache::lonnet::role_status($envkey,$then,$refresh,$now,\$role,\$where, \$trolecode,\$tstatus,\$tstart,\$tend); if ($tstatus eq 'is') { $destination .= ($destination =~ /\?/) ? '&' : '?'; @@ -115,28 +110,18 @@ sub success { $destination .= '&destinationurl='.$destsymb; } } - if ($destination =~ m{^/adm/roles}) { - $destination .= ($destination =~ /\?/) ? '&' : '?'; - $destination .= 'source=login'; - } - 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 $windowinfo = Apache::lonhtmlcommon::scripttag('self.name="loncapaclient";'); + my $header = ''; my $brcrum = [{'href' => '', 'text' => 'Successful Login'},]; my $start_page=&Apache::loncommon::start_page('Successful Login', - $startupremote, + $header, {'no_inline_link' => 1, 'bread_crumbs' => $brcrum,}); my $end_page =&Apache::loncommon::end_page(); - my $continuelink; - if ($env{'environment.remote'} eq 'off') { - $continuelink=''.&mt('Continue').''; - } + my $continuelink=''.&mt('Continue').''; # ------------------------------------------------- Output for successful login &Apache::loncommon::content_type($r,'text/html'); @@ -145,19 +130,16 @@ 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 $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'} -$welcome

+$lt{'mes'}

$lt{'pro'}

-$remoteinfo -$maincall $continuelink $end_page ENDSUCCESS @@ -225,21 +207,17 @@ sub handler { } else { # Indeed, a valid token is found &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); - &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(); - my $dest = '/adm/roles'; - if ($env{'form.firsturl'} ne '') { - $dest = $env{'form.firsturl'}; - } + &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( $start_page .'

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

' .'

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

' .$end_page ); @@ -285,8 +263,7 @@ sub handler { my $tmpinfo=Apache::lonnet::reply('tmpget:'.$form{'logtoken'}, $form{'serverid'}); - if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost') || - ($tmpinfo eq 'no_such_host')) { + if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) { &failed($r,'Information needed to verify your login information is missing, inaccessible or expired.',\%form); return OK; } else { @@ -340,48 +317,59 @@ sub handler { } # ---------------------------------------------------------------- Authenticate - + my @cancreate; my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$form{'udom'}); - my $domdesc = &Apache::lonnet::domain($form{'udom'},'description'); - my ($cancreate,$statustocreate) = - &Apache::createaccount::get_creation_controls($form{'udom'},$domconfig{'usercreation'}); - my $defaultauth; - if (ref($cancreate) eq 'ARRAY') { - if (grep(/^login$/,@{$cancreate})) { - $defaultauth = 1; + 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 $clientcancheckhost = 1; - my $uname = $form{'uname'}; - my $authhost=Apache::lonnet::authenticate($uname,$upass, - $form{'udom'},$defaultauth, - $clientcancheckhost); + my $defaultauth; + if (grep(/^login$/,@cancreate)) { + $defaultauth = 1; + } + my $authhost=Apache::lonnet::authenticate($form{'uname'},$upass, + $form{'udom'},$defaultauth); # --------------------------------------------------------------------- Failed? if ($authhost eq 'no_host') { - my $lc_uname = lc($uname); - if ($uname eq $lc_uname) { - &failed($r,'Username and/or password could not be authenticated.', - \%form); + &failed($r,'Username and/or password could not be authenticated.', + \%form); + return OK; + } elsif ($authhost eq 'no_account_on_host') { + my %domconfig = + &Apache::lonnet::get_dom('configuration',['usercreation'],$form{'udom'}); + if (grep(/^login$/,@cancreate)) { + my $start_page = + &Apache::loncommon::start_page('Create a user account in LON-CAPA', + '',{'no_inline_link' => 1,}); + my $domdesc = &Apache::lonnet::domain($form{'udom'},'description'); + 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); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + &Apache::createaccount::print_header($r,$start_page); + $r->print('

'.&mt('Account creation').'

'. + &mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account at this institution.').'
'. + $output.&Apache::loncommon::end_page()); return OK; } else { - $authhost=Apache::lonnet::authenticate($lc_uname,$upass, - $form{'udom'},$defaultauth); - if ($authhost eq 'no_host') { - &failed($r,'Username (in lower case) and/or password could not be authenticated.', - \%form); - return OK; - } elsif ($authhost eq 'no_account_on_host') { - &create_account($r,\%form,$cancreate,$lc_uname,$contact_name,$domdesc); - return OK; - } else { - $form{'uname'} = $lc_uname; - } + &failed($r,'Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.',\%form); + return OK; } - } elsif ($authhost eq 'no_account_on_host') { - &create_account($r,\%form,$cancreate,$uname,$contact_name,$domdesc); - return OK; } if (($firsturl eq '') || @@ -412,164 +400,14 @@ sub handler { } if ($r->dir_config("lonBalancer") eq 'yes') { - my $otherserver = &Apache::lonnet::spareserver(30000,undef,1,$form{'udom'}); - 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 { - if (!&check_can_host($r,\%form,$authhost,$domdesc)) { - 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; - } -} - -sub check_can_host { - my ($r,$form,$authhost,$domdesc) = @_; - return unless (ref($form) eq 'HASH'); - my $canhost = 1; - my $lonhost = $r->dir_config('lonHostID'); - my $udom = $form->{'udom'}; - 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)) { - my $machine_dom = &Apache::lonnet::host_domain($lonhost); - my $hostname = &Apache::lonnet::hostname($lonhost); - my $serverhomeID = &Apache::lonnet::get_server_homeID($hostname); - my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID); - my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom); - my %udomdefaults = &Apache::lonnet::get_domain_defaults($udom); - my $loncaparev; - if ($authhost eq 'no_account_on_host') { - $loncaparev = &Apache::lonnet::get_server_loncaparev($machine_dom); - } else { - $loncaparev = &Apache::lonnet::get_server_loncaparev($machine_dom,$lonhost); - } - $canhost = &Apache::lonnet::can_host_session($udom,$lonhost,$loncaparev, - $udomdefaults{'remotesessions'}, - $defdomdefaults{'hostedsessions'}); - } - unless ($canhost) { - if ($authhost eq 'no_account_on_host') { - 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 '') { - my $protocol = $Apache::lonnet::protocol{$login_host}; - $protocol = 'http' if ($protocol ne 'https'); - my $newurl = $protocol.'://'.$hostname.'/adm/createaccount'; - $r->print(&Apache::loncommon::start_page('Create a user account in LON-CAPA'). - '

'.&mt('Account creation').'

'. - &mt('You do not currently have a LON-CAPA account at this institution.').'
'. - '

'.&mt('You will be able to create one by logging into a LON-CAPA server within the [_1] domain.',$domdesc).'

'. - '

'.&mt('[_1]Log in[_2]','',''). - &Apache::loncommon::end_page()); - } else { - $r->print(&Apache::loncommon::start_page('Access to LON-CAPA unavailable'). - '

'.&mt('Account creation unavailable').'

'. - &mt('You do not currently have a LON-CAPA account at this institution.').'
'. - '

'.&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()); - } - } else { - &success($r,$form->{'uname'},$udom,$authhost,'noredirect',undef, - $form); - my ($otherserver) = &Apache::lonnet::choose_server($udom); - $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 create_account { - my ($r,$form,$cancreate,$uname,$contact_name,$domdesc) = @_; - return unless((ref($form) eq 'HASH') && (ref($cancreate) eq 'ARRAY')); - my %domconfig = - &Apache::lonnet::get_dom('configuration',['usercreation'],$form->{'udom'}); - if (&check_can_host($r,$form,'no_account_on_host',$domdesc)) { - my $start_page = - &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($uname,$form->{'udom'}, - $domdesc,'',$lonhost, - $contact_email,$contact_name); - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - &Apache::createaccount::print_header($r,$start_page); - $r->print('

'.&mt('Account creation').'

'. - &mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account at this institution.').'
'. - $output.&Apache::loncommon::end_page()); + &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef, + \%form); + $r->internal_redirect('/adm/switchserver'); } else { - &failed($r,'Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.',$form); + &success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,undef, + \%form); } - return; + return OK; } 1;