--- loncom/auth/lonacc.pm 2018/09/05 23:06:53 1.159.2.6
+++ loncom/auth/lonacc.pm 2020/07/19 16:41:27 1.159.2.8.2.2
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Cookie Based Access Handler
#
-# $Id: lonacc.pm,v 1.159.2.6 2018/09/05 23:06:53 raeburn Exp $
+# $Id: lonacc.pm,v 1.159.2.8.2.2 2020/07/19 16:41:27 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -332,17 +332,21 @@ sub sso_login {
($is_balancer,$otherserver) =
&Apache::lonnet::check_loadbalancing($user,$domain,'login');
if ($is_balancer) {
- if ($otherserver eq '') {
+ # Check if browser sent a LON-CAPA load balancer cookie (and this is a balancer)
+ my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r);
+ if (($found_server) && ($balancer_cookie =~ /^\Q$domain\E_\Q$user\E_/)) {
+ $otherserver = $found_server;
+ } elsif ($otherserver eq '') {
my $lowest_load;
($otherserver,undef,undef,undef,$lowest_load) = &Apache::lonnet::choose_server($domain);
if ($lowest_load > 100) {
$otherserver = &Apache::lonnet::spareserver($lowest_load,$lowest_load,1,$domain);
}
- }
- if ($otherserver ne '') {
- my @hosts = &Apache::lonnet::current_machine_ids();
- if (grep(/^\Q$otherserver\E$/,@hosts)) {
- $hosthere = $otherserver;
+ if ($otherserver ne '') {
+ my @hosts = &Apache::lonnet::current_machine_ids();
+ if (grep(/^\Q$otherserver\E$/,@hosts)) {
+ $hosthere = $otherserver;
+ }
}
}
}
@@ -351,6 +355,14 @@ sub sso_login {
# login but immediately go to switch server to find us a new
# machine
&Apache::lonauth::success($r,$user,$domain,$home,'noredirect');
+ foreach my $item (keys(%form)) {
+ $env{'form.'.$item} = $form{$item};
+ }
+ unless ($form{'symb'}) {
+ unless (($r->uri eq '/adm/roles') || ($r->uri eq '/adm/sso')) {
+ $env{'form.origurl'} = $r->uri;
+ }
+ }
$env{'request.sso.login'} = 1;
if (defined($r->dir_config("lonSSOReloginServer"))) {
$env{'request.sso.reloginserver'} =
@@ -497,7 +509,7 @@ sub handler {
my $preserved;
foreach my $pair (split(/&/,$query)) {
my ($name, $value) = split(/=/,$pair);
- unless ($name eq 'symb') {
+ unless (($name eq 'symb') || ($name eq 'usehttp')) {
$preserved .= $pair.'&';
}
if (($env{'request.course.id'}) && ($name eq 'folderpath')) {
@@ -537,6 +549,7 @@ sub handler {
my $lonhost = &Apache::lonnet::host_from_dns($hostname);
if ($lonhost) {
my $actual = &Apache::lonnet::absolute_url($hostname);
+ my $exphostname = &Apache::lonnet::hostname($lonhost);
my $expected = $Apache::lonnet::protocol{$lonhost}.'://'.$hostname;
unless ($actual eq $expected) {
$env{'request.use_absolute'} = $expected;
@@ -552,7 +565,7 @@ sub handler {
my $checkexempt;
if ($env{'user.loadbalexempt'} eq $r->dir_config('lonHostID')) {
if ($env{'user.loadbalcheck.time'} + 600 > time) {
- $checkexempt = 1;
+ $checkexempt = 1;
}
}
if ($env{'user.noloadbalance'} eq $r->dir_config('lonHostID')) {
@@ -562,22 +575,36 @@ sub handler {
($is_balancer,$otherserver) =
&Apache::lonnet::check_loadbalancing($env{'user.name'},
$env{'user.domain'});
+ if ($is_balancer) {
+ unless (($requrl eq '/adm/switchserver') && (!$r->is_initial_req())) {
+ # Check if browser sent a LON-CAPA load balancer cookie (and this is a balancer)
+ my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r);
+ if (($found_server) && ($balancer_cookie =~ /^\Q$env{'user.domain'}\E_\Q$env{'user.name'}\E_/)) {
+ $otherserver = $found_server;
+ }
+ }
+ }
}
if ($is_balancer) {
- $r->set_handlers('PerlResponseHandler'=>
- [\&Apache::switchserver::handler]);
- if ($otherserver ne '') {
- $env{'form.otherserver'} = $otherserver;
+ unless (($requrl eq '/adm/switchserver') && (!$r->is_initial_req())) {
+ $r->set_handlers('PerlResponseHandler'=>
+ [\&Apache::switchserver::handler]);
+ if ($otherserver ne '') {
+ $env{'form.otherserver'} = $otherserver;
+ }
}
unless (($env{'form.origurl'}) || ($r->uri eq '/adm/roles') ||
($r->uri eq '/adm/switchserver') || ($r->uri eq '/adm/sso')) {
$env{'form.origurl'} = $r->uri;
}
}
+ if ($requrl=~m{^/+tiny/+$match_domain/+\w+$}) {
+ return OK;
+ }
# ---------------------------------------------------------------- Check access
my $now = time;
- if ($requrl !~ m{^/(?:adm|public|prtspool)/}
+ if ($requrl !~ m{^/(?:adm|public|(?:prt|zip)spool)/}
|| $requrl =~ /^\/adm\/.*\/(smppg|bulletinboard)(\?|$ )/x) {
my $access=&Apache::lonnet::allowed('bre',$requrl);
if ($handle eq '') {
@@ -672,9 +699,16 @@ sub handler {
}
if ($env{'form.symb'}) {
$symb=&Apache::lonnet::symbclean($env{'form.symb'});
- if ($requrl =~ m|^/adm/wrapper/|
+ if ($requrl eq '/adm/navmaps') {
+ my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);
+ &Apache::lonnet::symblist($map,$murl => [$murl,$mid]);
+ } elsif ($requrl =~ m|^/adm/wrapper/|
|| $requrl =~ m|^/adm/coursedocs/showdoc/|) {
my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);
+ if ($map =~ /\.page$/) {
+ my $mapsymb = &Apache::lonnet::symbread($map);
+ ($map,$mid,$murl)=&Apache::lonnet::decode_symb($mapsymb);
+ }
&Apache::lonnet::symblist($map,$murl => [$murl,$mid],
'last_known' =>[$murl,$mid]);
} elsif ((&Apache::lonnet::symbverify($symb,$requrl)) ||
@@ -683,6 +717,10 @@ sub handler {
(($requrl=~m|(.*/aboutme)/portfolio$|) &&
&Apache::lonnet::symbverify($symb,$1))) {
my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);
+ if (($map =~ /\.page$/) && ($requrl !~ /\.page$/)) {
+ my $mapsymb = &Apache::lonnet::symbread($map);
+ ($map,$mid,$murl)=&Apache::lonnet::decode_symb($mapsymb);
+ }
&Apache::lonnet::symblist($map,$murl => [$murl,$mid],
'last_known' =>[$murl,$mid]);
} else {
@@ -708,8 +746,16 @@ sub handler {
if ($symb) {
my ($map,$mid,$murl)=
&Apache::lonnet::decode_symb($symb);
- &Apache::lonnet::symblist($map,$murl =>[$murl,$mid],
- 'last_known' =>[$murl,$mid]);
+ if ($requrl eq '/adm/navmaps') {
+ &Apache::lonnet::symblist($map,$murl =>[$murl,$mid]);
+ } else {
+ if (($map =~ /\.page$/) && ($requrl !~ /\.page$/)) {
+ my $mapsymb = &Apache::lonnet::symbread($map);
+ ($map,$mid,$murl)=&Apache::lonnet::decode_symb($mapsymb);
+ }
+ &Apache::lonnet::symblist($map,$murl =>[$murl,$mid],
+ 'last_known' =>[$murl,$mid]);
+ }
}
}
}
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.