--- loncom/auth/lonauth.pm 2011/06/10 01:30:33 1.101.8.6
+++ loncom/auth/lonauth.pm 2012/02/09 22:01:34 1.101.8.9.2.2
@@ -1,7 +1,7 @@
# The LearningOnline Network
# User Authentication Module
#
-# $Id: lonauth.pm,v 1.101.8.6 2011/06/10 01:30:33 raeburn Exp $
+# $Id: lonauth.pm,v 1.101.8.9.2.2 2012/02/09 22:01:34 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 =~ /\?/) ? '&' : '?';
@@ -110,6 +115,10 @@ 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);
@@ -136,16 +145,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'}
-$lt{'mes'}
+$welcome
$lt{'pro'}
$remoteinfo
$maincall
@@ -276,7 +285,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 {
@@ -330,64 +340,48 @@ 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 $domdesc = &Apache::lonnet::domain($form{'udom'},'description');
+ 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,
+ my $uname = $form{'uname'};
+ my $authhost=Apache::lonnet::authenticate($uname,$upass,
$form{'udom'},$defaultauth,
$clientcancheckhost);
# --------------------------------------------------------------------- Failed?
if ($authhost eq 'no_host') {
- &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 $domdesc = &Apache::lonnet::domain($form{'udom'},'description');
- 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',
- '',{'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);
- &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());
+ my $lc_uname = lc($uname);
+ if ($uname eq $lc_uname) {
+ &failed($r,'Username and/or password could not be authenticated.',
+ \%form);
return OK;
} 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);
- return OK;
+ $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;
+ }
}
+ } elsif ($authhost eq 'no_account_on_host') {
+ &create_account($r,\%form,$cancreate,$uname,$contact_name,$domdesc);
+ return OK;
}
if (($firsturl eq '') ||
@@ -417,17 +411,31 @@ sub handler {
}
}
- unless (&check_can_host($r,\%form,$authhost)) {
- return OK;
- }
-
if ($r->dir_config("lonBalancer") eq 'yes') {
- &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef,
- \%form);
my $otherserver = &Apache::lonnet::spareserver(30000,undef,1,$form{'udom'});
- $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl);
+ 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
@@ -444,6 +452,9 @@ sub handler {
# ---------------------------------------------------------- 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);
@@ -489,7 +500,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 '') {
@@ -519,6 +532,46 @@ sub check_can_host {
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());
+ } 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);
+ }
+ return;
+}
+
1;
__END__