--- loncom/auth/lonlogin.pm 2010/02/08 13:28:40 1.132
+++ loncom/auth/lonlogin.pm 2010/03/31 23:11:48 1.136
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.132 2010/02/08 13:28:40 bisitz Exp $
+# $Id: lonlogin.pm,v 1.136 2010/03/31 23:11:48 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -72,36 +72,31 @@ sub handler {
# -------------------------------- Prevent users from attempting to login twice
my $handle = &Apache::lonnet::check_for_valid_session($r);
- if ($handle=~/^publicuser\_/) {
+ if ($handle ne '') {
+ my $lonidsdir=$r->dir_config('lonIDsDir');
+ if ($handle=~/^publicuser\_/) {
# For "public user" - remove it, we apparently really want to login
- unlink($r->dir_config('lonIDsDir')."/$handle.id");
- } elsif ($handle ne '') {
+ unlink($r->dir_config('lonIDsDir')."/$handle.id");
+ } else {
# Indeed, a valid token is found
- 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'};
- }
-
- my $dom = &Apache::lonnet::default_login_domain();
- my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom);
-
- my $loginhelp_page = $helpconfig{'helpsettings'}{'loginhelpurl'};
- if ($loginhelp_page eq '') {
- $loginhelp_page = '/adm/loginproblems.html';
- }
- $r->print(
+ &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
+ 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].',
'','','','').'
'
- .''.&mt('Login problems?').'
'
- .$dom.' '.$end_page
+ .$end_page
);
- return OK;
+ return OK;
+ }
}
# ---------------------------------------------------- No valid token, continue
@@ -121,15 +116,12 @@ sub handler {
my $lonhost = $r->dir_config('lonHostID');
my $domain = &Apache::lonnet::default_login_domain();
- my %domconfhash = &Apache::loncommon::get_domainconf($domain);
if ($lonhost ne '') {
- my $loginvia = $domconfhash{$domain.'.login.loginvia_'.$lonhost};
- if (($loginvia ne '') && ($loginvia ne $lonhost)) {
- if (&Apache::lonnet::hostname($loginvia) ne '') {
- $r->print(&redirect_page($loginvia));
- return OK;
- }
- }
+ my $redirect = &check_loginvia($domain,$lonhost);
+ if ($redirect) {
+ $r->print($redirect);
+ return OK;
+ }
}
if (($env{'form.domain'}) &&
@@ -364,7 +356,7 @@ my %lt=&Apache::lonlocal::texthash(
my $forgotpw = &forgotpwdisplay(%lt);
$forgotpw .= '
' if $forgotpw;
-my $loginhelp = &loginhelpdisplay(%lt);
+my $loginhelp = &loginhelpdisplay($authdomain,%lt);
$loginhelp .= '
' if $loginhelp;
# ---------------------------------------------------- Serve out DES JavaScript
@@ -529,15 +521,57 @@ ENDDOCUMENT
return OK;
}
+sub check_loginvia {
+ my ($domain,$lonhost) = @_;
+ if ($domain eq '' || $lonhost eq '') {
+ return;
+ }
+ my %domconfhash = &Apache::loncommon::get_domainconf($domain);
+ my $loginvia = $domconfhash{$domain.'.login.loginvia_'.$lonhost};
+ my $loginvia_exempt = $domconfhash{$domain.'.login.loginvia_exempt_'.$lonhost};
+ my $output;
+ if ($loginvia ne '') {
+ my $noredirect;
+ my $ip = $ENV{'REMOTE_ADDR'};
+ if ($ip eq '127.0.0.1') {
+ $noredirect = 1;
+ } else {
+ if ($loginvia_exempt ne '') {
+ my @exempt = split(',',$loginvia_exempt);
+ if (grep(/^\Q$ip\E$/,@exempt)) {
+ $noredirect = 1;
+ }
+ }
+ }
+ unless ($noredirect) {
+ my ($newhost,$path);
+ if ($loginvia =~ /:/) {
+ ($newhost,$path) = split(':',$loginvia);
+ } else {
+ $newhost = $loginvia;
+ }
+ if ($newhost ne $lonhost) {
+ if (&Apache::lonnet::hostname($newhost) ne '') {
+ $output = &redirect_page($newhost,$path);
+ }
+ }
+ }
+ }
+ return $output;
+}
+
sub redirect_page {
- my ($desthost) = @_;
+ my ($desthost,$path) = @_;
my $protocol = $Apache::lonnet::protocol{$desthost};
$protocol = 'http' if ($protocol ne 'https');
- my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).'/';
+ unless ($path =~ m{^/}) {
+ $path = '/'.$path;
+ }
+ my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).$path;
if ($env{'form.firsturl'} ne '') {
$url .='?firsturl='.$env{'form.firsturl'};
}
- my $start_page = &Apache::loncommon::start_page('Switching Server',undef,
+ my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,
{'redirect' => [0,$url],});
my $end_page = &Apache::loncommon::end_page();
return $start_page.$end_page;
@@ -587,17 +621,20 @@ sub forgotpwdisplay {
}
sub loginhelpdisplay {
- my (%lt) = @_;
+ my ($authdomain,%lt) = @_;
my $login_help = 1;
if ($login_help) {
- my $dom = &Apache::lonnet::default_login_domain();
- my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom);
- my $loginhelp_url = $helpconfig{'helpsettings'}{'loginhelpurl'};
- if ($loginhelp_url ne '') {
- return ''.$lt{'help'}.'';
+ my $dom = $authdomain;
+ if ($dom eq '') {
+ $dom = &Apache::lonnet::default_login_domain();
+ }
+ my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom);
+ my $loginhelp_url = $helpconfig{'helpsettings'}{'loginhelpurl'};
+ if ($loginhelp_url ne '') {
+ return ''.$lt{'help'}.'';
} else {
- return ''.$lt{'help'}.'';
- }
+ return ''.$lt{'help'}.'';
+ }
}
return;
}
@@ -605,7 +642,7 @@ sub loginhelpdisplay {
sub coursecatalog_link {
my ($linkname) = @_;
return <<"END";
- $linkname
+ $linkname
END
}