--- loncom/auth/lonlogin.pm 2018/12/26 20:10:21 1.177
+++ loncom/auth/lonlogin.pm 2021/09/21 22:54:26 1.184
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.177 2018/12/26 20:10:21 raeburn Exp $
+# $Id: lonlogin.pm,v 1.184 2021/09/21 22:54:26 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -47,7 +47,7 @@ sub handler {
(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},
$ENV{'REDIRECT_QUERY_STRING'}),
['interface','username','domain','firsturl','localpath','localres',
- 'token','role','symb','iptoken','btoken','ltoken']);
+ 'token','role','symb','iptoken','btoken','ltoken','linkkey','saml']);
if (!defined($env{'form.firsturl'})) {
&Apache::lonacc::get_posted_cgi($r,['firsturl']);
}
@@ -56,6 +56,10 @@ sub handler {
$env{'form.firsturl'} = $ENV{'REDIRECT_URL'};
}
}
+ if (($env{'form.firsturl'} =~ m{^/+tiny/+$LONCAPA::match_domain/+\w+$}) &&
+ (!$env{'form.ltoken'}) && (!$env{'form.linkkey'})) {
+ &Apache::lonacc::get_posted_cgi($r,['linkkey']);
+ }
# -- check if they are a migrating user
if (defined($env{'form.token'})) {
@@ -131,11 +135,18 @@ sub handler {
}
&Apache::lonnet::tmpdel($env{'form.ltoken'});
delete($env{'form.ltoken'});
+ } elsif ($env{'form.linkkey'}) {
+ $info{'linkkey'} = $env{'form.linkkey'};
+ delete($env{'form.linkkey'});
}
my $balancer_token = &Apache::lonnet::tmpput(\%info,$found_server);
if ($balancer_token) {
$dest .= (($dest=~/\?/)?'&;':'?') . 'btoken='.$balancer_token;
}
+ unless ($found_server eq $lonhost) {
+ my $alias = &Apache::lonnet::use_proxy_alias($r,$found_server);
+ $hostname = $alias if ($alias ne '');
+ }
my $url = $protocol.'://'.$hostname.$dest;
my $start_page =
&Apache::loncommon::start_page('Switching Server ...',undef,
@@ -151,13 +162,15 @@ sub handler {
# it a balancer cookie for an active session on this server.
#
- my ($balcookie,$linkprot);
+ my ($balcookie,$linkprot,$linkkey);
if ($env{'form.btoken'}) {
my %info = &Apache::lonnet::tmpget($env{'form.btoken'});
$balcookie = $info{'balcookie'};
if ($balcookie) {
if ($info{'linkprot'}) {
$linkprot = $info{'linkprot'};
+ } elsif ($info{'linkkey'}) {
+ $linkkey = $info{'linkkey'};
}
}
&Apache::lonnet::tmpdel($env{'form.btoken'});
@@ -213,7 +226,7 @@ sub handler {
}
if ($env{'user.linkproturi'}) {
my @proturis = split(/,/,$env{'user.linkproturi'});
- unless(grep(/^\Q$deeplink\E$/,@proturis)) {
+ unless (grep(/^\Q$deeplink\E$/,@proturis)) {
push(@proturis,$deeplink);
@proturis = sort @proturis;
&Apache::lonnet::appenv({'user.linkproturi' => join(',',@proturis)});
@@ -222,6 +235,31 @@ sub handler {
&Apache::lonnet::appenv({'user.linkproturi' => $deeplink});
}
}
+ } elsif (($env{'form.linkkey'}) || ($linkkey)) {
+ if ($env{'form.firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
+ if ($linkkey eq '') {
+ $linkkey = $env{'form.linkkey'};
+ }
+ if ($env{'user.deeplinkkey'}) {
+ my @linkkeys = split(/,/,$env{'user.deeplinkkey'});
+ unless (grep(/^\Q$linkkey\E$/,@linkkeys)) {
+ push(@linkkeys,$linkkey);
+ &Apache::lonnet::appenv({'user.deeplinkkey' => join(',',sort(@linkkeys))});
+ }
+ } else {
+ &Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey});
+ }
+ my $deeplink = $env{'form.firsturl'};
+ if ($env{'user.keyedlinkuri'}) {
+ my @keyeduris = split(/,/,$env{'user.keyedlinkuri'});
+ unless (grep(/^\Q$deeplink\E$/,@keyeduris)) {
+ push(@keyeduris,$deeplink);
+ &Apache::lonnet::appenv({'user.keyedlinkuri' => join(',',sort(@keyeduris))});
+ }
+ } else {
+ &Apache::lonnet::appenv({'user.keyedlinkuri' => $deeplink});
+ }
+ }
}
$r->print(
$start_page
@@ -373,6 +411,11 @@ sub handler {
}
$tokenextras .= '&linkprot='.&escape($info{'linkprot'});
}
+ } elsif ($env{'form.linkkey'}) {
+ if (!$tokenextras) {
+ $tokenextras = '&&&';
+ }
+ $tokenextras .= '&linkkey='.&escape($env{'form.linkkey'});
}
my $logtoken=Apache::lonnet::reply(
'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras,
@@ -386,22 +429,36 @@ sub handler {
&Apache::lonnet::logthis('No valid logtoken for log-in page -- unable to determine hostname for hostID: '.$lonhost.'. Check entry in hosts.tab');
}
my $spares='';
- my $last;
- foreach my $hostid (sort
- {
- &Apache::lonnet::hostname($a) cmp
- &Apache::lonnet::hostname($b);
- }
- keys(%Apache::lonnet::spareid)) {
+ my (@sparehosts,%spareservers);
+ my $sparesref = &Apache::lonnet::this_host_spares($defdom);
+ if (ref($sparesref) eq 'HASH') {
+ foreach my $key (keys(%{$sparesref})) {
+ if (ref($sparesref->{$key}) eq 'ARRAY') {
+ my @sorted = sort { &Apache::lonnet::hostname($a) cmp
+ &Apache::lonnet::hostname($b);
+ } @{$sparesref->{$key}};
+ if (@sorted) {
+ if ($key eq 'primary') {
+ unshift(@sparehosts,@sorted);
+ } elsif ($key eq 'default') {
+ push(@sparehosts,@sorted);
+ }
+ }
+ }
+ }
+ }
+ foreach my $hostid (@sparehosts) {
next if ($hostid eq $lonhost);
my $hostname = &Apache::lonnet::hostname($hostid);
- next if (($last eq $hostname) || ($hostname eq ''));
- $spares.='
'.
$hostname.''.
- ' '.&mt('(preferred)').''.$/;
- $last=$hostname;
+ ' '.&mt('(preferred)').''.$/;
}
if ($spares) {
$spares.= '
';
@@ -413,23 +470,26 @@ sub handler {
&Apache::lonnet::hostname($b);
}
keys(%all_hostnames)) {
- next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
+ next if ($hostid eq $lonhost);
my $hostname = &Apache::lonnet::hostname($hostid);
- next if (($last eq $hostname) || ($hostname eq ''));
- $spares.='
'.
$hostname.'';
- $last=$hostname;
}
$r->print(
- ''
- .'
'.&mt('Please attempt to login to one of the following servers:')
@@ -521,17 +581,9 @@ function enableInput() {
ENDSCRIPT
-# --------------------------------------------------- Print login screen header
-
- my %add_entries = (
- bgcolor => "$mainbg",
- text => "$font",
- link => "$link",
- vlink => "$vlink",
- alink => "$alink",
- onload => 'javascript:enableInput();',);
-
- my ($lonhost_in_use,$headextra,$headextra_exempt,@hosts,%defaultdomconf);
+ my ($lonhost_in_use,@hosts,%defaultdomconf,$saml_prefix,$saml_landing,
+ $samlssotext,$samlnonsso,$samlssoimg,$samlssoalt,$samlssourl,$samltooltip);
+ %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
@hosts = &Apache::lonnet::current_machine_ids();
$lonhost_in_use = $lonhost;
if (@hosts > 1) {
@@ -542,14 +594,74 @@ ENDSCRIPT
}
}
}
- %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
+ $saml_prefix = $defdom.'.login.saml_';
+ if ($defaultdomconf{$saml_prefix.$lonhost_in_use}) {
+ $saml_landing = 1;
+ $samlssotext = $defaultdomconf{$saml_prefix.'text_'.$lonhost_in_use};
+ $samlnonsso = $defaultdomconf{$saml_prefix.'notsso_'.$lonhost_in_use};
+ $samlssoimg = $defaultdomconf{$saml_prefix.'img_'.$lonhost_in_use};
+ $samlssoalt = $defaultdomconf{$saml_prefix.'alt_'.$lonhost_in_use};
+ $samlssourl = $defaultdomconf{$saml_prefix.'url_'.$lonhost_in_use};
+ $samltooltip = $defaultdomconf{$saml_prefix.'title_'.$lonhost_in_use};
+ }
+ if ($saml_landing) {
+ if ($samlssotext eq '') {
+ $samlssotext = 'SSO Login';
+ }
+ if ($samlnonsso eq '') {
+ $samlnonsso = 'Non-SSO Login';
+ }
+ $js .= <<"ENDSAMLJS";
+
+
+
+ENDSAMLJS
+ }
+
+# --------------------------------------------------- Print login screen header
+
+ my %add_entries = (
+ bgcolor => "$mainbg",
+ text => "$font",
+ link => "$link",
+ vlink => "$vlink",
+ alink => "$alink",
+ onload => 'javascript:enableInput();',);
+
+ my ($headextra,$headextra_exempt,@hosts,%defaultdomconf);
$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 '') {
my @exempt = split(',',$headextra_exempt);
- my $ip = $ENV{'REMOTE_ADDR'};
+ my $ip = &Apache::lonnet::get_requestor_ip();
if (grep(/^\Q$ip\E$/,@exempt)) {
$omitextra = 1;
}
@@ -587,6 +699,7 @@ ENDSCRIPT
'helpdesk' => 'Contact Helpdesk',
'forgotpw' => 'Forgot password?',
'newuser' => 'New User?',
+ 'change' => 'Change?',
);
# -------------------------------------------------- Change password field name
@@ -648,7 +761,7 @@ ENDSERVERFORM
$mobileargs = 'autocapitalize="off" autocorrect="off"';
}
my $loginform=(<