--- loncom/auth/lonacc.pm 2013/12/19 22:50:16 1.150
+++ loncom/auth/lonacc.pm 2020/03/06 20:17:52 1.159.2.9
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Cookie Based Access Handler
#
-# $Id: lonacc.pm,v 1.150 2013/12/19 22:50:16 raeburn Exp $
+# $Id: lonacc.pm,v 1.159.2.9 2020/03/06 20:17:52 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -109,7 +109,6 @@ sub cleanup {
my ($r)=@_;
if (! $r->is_initial_req()) { return DECLINED; }
&Apache::lonnet::save_cache();
- &Apache::lontexconvert::jsMath_reset();
return OK;
}
@@ -160,6 +159,8 @@ sub get_posted_cgi {
if (length($value) == 1) {
$value=~s/[\r\n]$//;
}
+ } elsif ($fname =~ /\.(xls|doc|ppt)(x|m)$/i) {
+ $value=~s/[\r\n]$//;
}
if (ref($fields) eq 'ARRAY') {
next if (!grep(/^\Q$name\E$/,@{$fields}));
@@ -280,15 +281,17 @@ sub upload_size_allowed {
sub sso_login {
my ($r,$handle,$username) = @_;
- my $lonidsdir=$r->dir_config('lonIDsDir');
- if (($r->user eq '') || ($username ne '') ||
+ if (($r->user eq '') || ($username ne '') || ($r->user eq 'public:public') ||
(defined($env{'user.name'}) && (defined($env{'user.domain'}))
&& ($handle ne ''))) {
# not an SSO case or already logged in
return undef;
}
- my ($user) = ($r->user =~ m/([a-zA-Z0-9_\-@.]*)/);
+ my ($user) = ($r->user =~ m/^($match_username)$/);
+ if ($user eq '') {
+ return undef;
+ }
my $query = $r->args;
my %form;
@@ -305,7 +308,10 @@ sub sso_login {
my %sessiondata;
if ($form{'iptoken'}) {
%sessiondata = &Apache::lonnet::tmpget($form{'iptoken'});
- my $delete = &Apache::lonnet::tmpdel($form{'token'});
+ my $delete = &Apache::lonnet::tmpdel($form{'iptoken'});
+ unless ($sessiondata{'sessionserver'}) {
+ delete($form{'iptoken'});
+ }
}
my $domain = $r->dir_config('lonSSOUserDomain');
@@ -317,17 +323,35 @@ sub sso_login {
&Apache::lonnet::logthis(" SSO authorized user $user ");
my ($is_balancer,$otherserver,$hosthere);
if ($form{'iptoken'}) {
- if (($sessiondata{'domain'} eq $form{'udom'}) &&
- ($sessiondata{'username'} eq $form{'uname'})) {
+ if (($sessiondata{'domain'} eq $domain) &&
+ ($sessiondata{'username'} eq $user)) {
$hosthere = 1;
}
}
unless ($hosthere) {
($is_balancer,$otherserver) =
- &Apache::lonnet::check_loadbalancing($user,$domain);
+ &Apache::lonnet::check_loadbalancing($user,$domain,'login');
+ if ($is_balancer) {
+ # 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 ($is_balancer) {
+ if (($is_balancer) && (!$hosthere)) {
# login but immediately go to switch server to find us a new
# machine
&Apache::lonauth::success($r,$user,$domain,$home,'noredirect');
@@ -345,25 +369,23 @@ sub sso_login {
} else {
# need to login them in, so generate the need data that
# migrate expects to do login
- my $ip;
- my $c = $r->connection;
- eval {
- $ip = $c->remote_ip();
- };
- if ($@) {
- $ip = $c->client_ip();
- }
+ my $ip = $r->get_remote_host();
my %info=('ip' => $ip,
'domain' => $domain,
'username' => $user,
'server' => $r->dir_config('lonHostID'),
'sso.login' => 1
);
- foreach my $item ('role','symb') {
+ foreach my $item ('role','symb','iptoken') {
if (exists($form{$item})) {
$info{$item} = $form{$item};
}
}
+ unless ($info{'symb'}) {
+ unless (($r->uri eq '/adm/roles') || ($r->uri eq '/adm/sso')) {
+ $info{'origurl'} = $r->uri;
+ }
+ }
if ($r->dir_config("ssodirecturl") == 1) {
$info{'origurl'} = $r->uri;
}
@@ -371,6 +393,9 @@ sub sso_login {
$info{'sso.reloginserver'} =
$r->dir_config('lonSSOReloginServer');
}
+ if (($is_balancer) && ($hosthere)) {
+ $info{'noloadbalance'} = $hosthere;
+ }
my $token =
&Apache::lonnet::tmpput(\%info,
$r->dir_config('lonHostID'));
@@ -379,10 +404,8 @@ sub sso_login {
$r->set_handlers('PerlHandler'=> undef);
}
return OK;
- } elsif (defined($r->dir_config('lonSSOUserUnknownRedirect'))) {
+ } else {
&Apache::lonnet::logthis(" SSO authorized unknown user $user ");
- $r->subprocess_env->set('SSOUserUnknown' => $user);
- $r->subprocess_env->set('SSOUserDomain' => $domain);
my @cancreate;
my %domconfig =
&Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
@@ -396,13 +419,18 @@ sub sso_login {
}
}
}
- if (grep(/^sso$/,@cancreate)) {
- $r->internal_redirect('/adm/createaccount');
- } else {
- $r->internal_redirect($r->dir_config('lonSSOUserUnknownRedirect'));
+ if ((grep(/^sso$/,@cancreate)) || (defined($r->dir_config('lonSSOUserUnknownRedirect')))) {
+ $r->subprocess_env->set('SSOUserUnknown' => $user);
+ $r->subprocess_env->set('SSOUserDomain' => $domain);
+ if (grep(/^sso$/,@cancreate)) {
+ $r->set_handlers('PerlHandler'=> [\&Apache::createaccount::handler]);
+ $r->handler('perl-script');
+ } else {
+ $r->internal_redirect($r->dir_config('lonSSOUserUnknownRedirect'));
+ $r->set_handlers('PerlHandler'=> undef);
+ }
+ return OK;
}
- $r->set_handlers('PerlHandler'=> undef);
- return OK;
}
return undef;
}
@@ -432,7 +460,10 @@ sub handler {
my ($is_balancer,$otherserver);
if ($handle eq '') {
- unless (($requrl eq '/adm/switchserver') && (!$r->is_initial_req())) {
+ unless ((($requrl eq '/adm/switchserver') && (!$r->is_initial_req())) ||
+ ($requrl =~ m{^/public/$match_domain/$match_courseid/syllabus}) ||
+ ($requrl =~ m{^/adm/help/}) ||
+ ($requrl =~ m{^/res/$match_domain/$match_username/})) {
$r->log_reason("Cookie not valid", $r->filename);
}
} elsif ($handle ne '') {
@@ -463,14 +494,14 @@ sub handler {
}
$env{'request.filename'} = $r->filename;
$env{'request.noversionuri'} = &Apache::lonnet::deversion($requrl);
- my $suppext;
+ my ($suppext,$checkabsolute);
if ($requrl =~ m{^/adm/wrapper/ext/}) {
my $query = $r->args;
if ($query) {
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')) {
@@ -484,6 +515,9 @@ sub handler {
$env{'request.external.querystring'} = $preserved;
}
}
+ if ($env{'request.course.id'}) {
+ $checkabsolute = 1;
+ }
} elsif ($env{'request.course.id'} &&
(($requrl =~ m{^/adm/$match_domain/$match_username/aboutme$}) ||
($requrl =~ m{^/public/$cdom/$cnum/syllabus$}))) {
@@ -498,6 +532,20 @@ sub handler {
}
}
}
+ if ($requrl =~ m{^/public/$cdom/$cnum/syllabus$}) {
+ $checkabsolute = 1;
+ }
+ }
+ if ($checkabsolute) {
+ my $hostname = $r->hostname();
+ my $lonhost = &Apache::lonnet::host_from_dns($hostname);
+ if ($lonhost) {
+ my $actual = &Apache::lonnet::absolute_url($hostname);
+ my $expected = $Apache::lonnet::protocol{$lonhost}.'://'.$hostname;
+ unless ($actual eq $expected) {
+ $env{'request.use_absolute'} = $expected;
+ }
+ }
}
# -------------------------------------------------------- Load POST parameters
@@ -508,7 +556,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')) {
@@ -518,12 +566,27 @@ 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;
}
}
@@ -532,6 +595,13 @@ sub handler {
if ($requrl !~ m{^/(?:adm|public|prtspool)/}
|| $requrl =~ /^\/adm\/.*\/(smppg|bulletinboard)(\?|$ )/x) {
my $access=&Apache::lonnet::allowed('bre',$requrl);
+ if ($handle eq '') {
+ unless ($access eq 'F') {
+ if ($requrl =~ m{^/res/$match_domain/$match_username/}) {
+ $r->log_reason("Cookie not valid", $r->filename);
+ }
+ }
+ }
if ($access eq '1') {
$env{'user.error.msg'}="$requrl:bre:0:0:Choose Course";
return HTTP_NOT_ACCEPTABLE;
@@ -559,6 +629,12 @@ sub handler {
return HTTP_NOT_ACCEPTABLE;
}
}
+ } elsif (($handle =~ /^publicuser_\d+$/) && (&Apache::lonnet::is_portfolio_url($requrl))) {
+ my $clientip = $r->get_remote_host();
+ if (&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip) ne 'F') {
+ $env{'user.error.msg'}="$requrl:bre:1:1:Access Denied";
+ return HTTP_NOT_ACCEPTABLE;
+ }
} else {
$env{'user.error.msg'}="$requrl:bre:1:1:Access Denied";
return HTTP_NOT_ACCEPTABLE;
@@ -611,9 +687,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)) ||
@@ -622,6 +705,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 {
@@ -647,8 +734,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]);
+ }
}
}
}
@@ -697,7 +792,8 @@ sub handler {
}
# ------------------------------------ See if this is a viewable portfolio file
if (&Apache::lonnet::is_portfolio_url($requrl)) {
- my $access=&Apache::lonnet::allowed('bre',$requrl);
+ my $clientip = $r->get_remote_host();
+ my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip);
if ($access eq 'A') {
&Apache::restrictedaccess::setup_handler($r);
return OK;
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.