--- loncom/auth/lonauth.pm 2012/02/09 22:01:34 1.101.8.9.2.2
+++ loncom/auth/lonauth.pm 2012/04/11 11:40:07 1.121
@@ -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.121 2012/04/11 11:40:07 goltermann Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -120,23 +120,16 @@ sub success {
$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,
- {'no_inline_link' => 1,
- 'bread_crumbs' => $brcrum,});
+ $header,
+ {'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');
@@ -148,16 +141,13 @@ sub success {
'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.','','');
+ 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{'pro'}
-$remoteinfo
-$maincall
$continuelink
$end_page
ENDSUCCESS
@@ -167,8 +157,7 @@ ENDSUCCESS
sub failed {
my ($r,$message,$form) = @_;
- my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,
- {'no_inline_link' => 1,});
+ my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef);
my $retry = '/adm/login?username='.$form->{'uname'}.
'&domain='.$form->{'udom'};
if (exists($form->{role})) {
@@ -206,9 +195,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;
}
@@ -225,19 +215,19 @@ 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();
+ &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'};
}
$r->print(
$start_page
- .''.&mt('You are already logged in!').'
'
+ .''
.'
'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].'
,'','','','')
.'
'
@@ -285,8 +275,8 @@ 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') ||
+ ($tmpinfo eq 'no_such_host')) {
&failed($r,'Information needed to verify your login information is missing, inaccessible or expired.',\%form);
return OK;
} else {
@@ -342,7 +332,6 @@ sub handler {
# ---------------------------------------------------------------- Authenticate
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;
@@ -352,36 +341,46 @@ sub handler {
}
}
my $clientcancheckhost = 1;
- my $uname = $form{'uname'};
- my $authhost=Apache::lonnet::authenticate($uname,$upass,
+ my $authhost=Apache::lonnet::authenticate($form{'uname'},$upass,
$form{'udom'},$defaultauth,
$clientcancheckhost);
# --------------------------------------------------------------------- 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);
- 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);
+ &failed($r,'Username and/or password could not be authenticated.',
+ \%form);
+ return OK;
+ } elsif ($authhost eq 'no_account_on_host') {
+ if ($defaultauth) {
+ my $domdesc = &Apache::lonnet::domain($form{'udom'},'description');
+ unless (&check_can_host($r,\%form,'no_account_on_host',$domdesc)) {
return OK;
- } else {
- $form{'uname'} = $lc_uname;
}
+ my $start_page =
+ &Apache::loncommon::start_page('Create a user account in LON-CAPA');
+ 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,
+ undef,$statustocreate);
+ &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 {
+ &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 '') ||
@@ -411,21 +410,23 @@ sub handler {
}
}
- if ($r->dir_config("lonBalancer") eq 'yes') {
- my $otherserver = &Apache::lonnet::spareserver(30000,undef,1,$form{'udom'});
- if (!$otherserver) {
+ my ($is_balancer,$otherserver) =
+ &Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'});
+
+ 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);
+ $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl);
} else {
$r->print(&noswitch());
}
return OK;
} else {
- if (!&check_can_host($r,\%form,$authhost,$domdesc)) {
+ 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,
@@ -436,6 +437,7 @@ sub handler {
}
return OK;
}
+
# ------------------------------------------------------- Do the load balancing
# ---------------------------------------------------------- Determine own load
@@ -501,7 +503,7 @@ sub check_can_host {
unless ($canhost) {
if ($authhost eq 'no_account_on_host') {
my $checkloginvia = 1;
- my ($login_host,$hostname) =
+ my ($login_host,$hostname) =
&Apache::lonnet::choose_server($udom,$checkloginvia);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -541,37 +543,6 @@ sub noswitch {
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__