--- loncom/auth/lonlogin.pm 2015/03/06 20:39:22 1.162
+++ loncom/auth/lonlogin.pm 2018/01/12 15:26:39 1.172
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.162 2015/03/06 20:39:22 raeburn Exp $
+# $Id: lonlogin.pm,v 1.172 2018/01/12 15:26:39 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,6 +38,7 @@ use Apache::lonlocal;
use Apache::migrateuser();
use lib '/home/httpd/lib/perl/';
use LONCAPA;
+use CGI::Cookie();
sub handler {
my $r = shift;
@@ -50,15 +51,46 @@ sub handler {
if (!defined($env{'form.firsturl'})) {
&Apache::lonacc::get_posted_cgi($r,['firsturl']);
}
+ if (!defined($env{'form.firsturl'})) {
+ if ($ENV{'REDIRECT_URL'} =~ m{^/+tiny/+$LONCAPA::match_domain/+\w+$}) {
+ $env{'form.firsturl'} = $ENV{'REDIRECT_URL'};
+ }
+ }
# -- check if they are a migrating user
if (defined($env{'form.token'})) {
return &Apache::migrateuser::handler($r);
}
+# For "public user" - remove any exising "public" cookie, as user really wants to log-in
+ my ($handle,$lonidsdir,$expirepub,$userdom);
+ unless ($r->header_only) {
+ $handle = &Apache::lonnet::check_for_valid_session($r,'lonID',undef,\$userdom);
+ if ($handle ne '') {
+ $lonidsdir=$r->dir_config('lonIDsDir');
+ if ($handle=~/^publicuser\_/) {
+ unlink($r->dir_config('lonIDsDir')."/$handle.id");
+ undef($handle);
+ undef($userdom);
+ $expirepub = 1;
+ }
+ }
+ }
+
&Apache::loncommon::no_cache($r);
&Apache::lonlocal::get_language_handle($r);
&Apache::loncommon::content_type($r,'text/html');
+ if ($expirepub) {
+ my $c = new CGI::Cookie(-name => 'lonPubID',
+ -value => '',
+ -expires => '-10y',);
+ $r->header_out('Set-cookie' => $c);
+ } elsif (($handle eq '') && ($userdom ne '')) {
+ my $c = new CGI::Cookie(-name => 'lonID',
+ -value => '',
+ -expires => '-10y',);
+ $r->headers_out->add('Set-cookie' => $c);
+ }
$r->send_http_header;
return OK if $r->header_only;
@@ -70,35 +102,44 @@ sub handler {
return OK;
}
+#
+# If browser sent an old cookie for which the session file had been removed
+# check if configuration for user's domain has a portal URL set. If so
+# switch user's log-in to the portal.
+#
+
+ if (($handle eq '') && ($userdom ne '')) {
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($userdom);
+ if ($domdefaults{'portal_def'} =~ /^https?\:/) {
+ my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,
+ {'redirect' => [0,$domdefaults{'portal_def'}],});
+ my $end_page = &Apache::loncommon::end_page();
+ $r->print($start_page.$end_page);
+ return OK;
+ }
+ }
+
$env{'form.firsturl'} =~ s/(`)/'/g;
# -------------------------------- Prevent users from attempting to login twice
- my $handle = &Apache::lonnet::check_for_valid_session($r);
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");
- } else {
-# Indeed, a valid token is found
- &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(
+ &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].',
'','','','').'
'
.$end_page
);
- return OK;
- }
+ return OK;
}
# ---------------------------------------------------- No valid token, continue
@@ -352,18 +393,12 @@ uextkey=this.document.client.elements.ue
lextkey=this.document.client.elements.lextkey.value;
initkeys();
-this.document.server.elements.upass0.value
- =this.document.client.elements.upass$now.value.substr(0,15);
-this.document.server.elements.upass1.value
- =this.document.client.elements.upass$now.value.substr(15,15);
-this.document.server.elements.upass2.value
- =this.document.client.elements.upass$now.value.substr(30,15);
-
if(this.document.server.action.substr(0,5) === 'http:'){
- for (var idx in [1,2,3]){
- this.document.server.elements['upass' + idx].value =
- crypted(this.document.server.elements['upass' + idx].value);
- }
+ this.document.server.elements.upass0.value
+ =getCrypted(this.document.client.elements.upass$now.value);
+} else {
+ this.document.server.elements.upass0.value
+ =this.document.client.elements.upass$now.value;
}
this.document.client.elements.uname.value='';
@@ -395,9 +430,20 @@ ENDSCRIPT
alink => "$alink",
onload => 'javascript:enableInput();',);
- my %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
- my $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost};
- my $headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost};
+ my ($lonhost_in_use,$headextra,$headextra_exempt,@hosts,%defaultdomconf);
+ @hosts = &Apache::lonnet::current_machine_ids();
+ $lonhost_in_use = $lonhost;
+ if (@hosts > 1) {
+ foreach my $hostid (@hosts) {
+ if (&Apache::lonnet::host_domain($hostid) eq $defdom) {
+ $lonhost_in_use = $hostid;
+ last;
+ }
+ }
+ }
+ %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
+ $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost_in_use};
+ $headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost_in_use};
if ($headextra) {
my $omitextra;
if ($headextra_exempt ne '') {
@@ -409,7 +455,7 @@ ENDSCRIPT
}
unless ($omitextra) {
my $confname = $defdom.'-domainconfig';
- if ($headextra =~ m{^\Q/res/$defdom/$confname/login/headtag/$lonhost/\E}) {
+ if ($headextra =~ m{^\Q/res/$defdom/$confname/login/headtag/$lonhost_in_use/\E}) {
my $extra = &Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$headextra));
unless ($extra eq '-1') {
$js .= "\n".$extra."\n";
@@ -468,8 +514,6 @@ ENDSCRIPT
-
-
@@ -520,7 +564,7 @@ LFORM
$r->print(<
-
+
ENDTOP
if ($showmainlogo) {
- $r->print('
'."\n");
+ $r->print('
'."\n");
}
$r->print(<