version 1.159.2.8.2.11, 2021/02/10 11:37:49
|
version 1.159.2.21, 2021/12/12 00:53:57
|
Line 159 sub get_posted_cgi {
|
Line 159 sub get_posted_cgi {
|
if (length($value) == 1) { |
if (length($value) == 1) { |
$value=~s/[\r\n]$//; |
$value=~s/[\r\n]$//; |
} |
} |
} elsif ($fname =~ /\.(xls|doc|ppt)(x|m)$/i) { |
} |
|
if ($fname =~ /\.(xls|doc|ppt)(x|m)$/i) { |
$value=~s/[\r\n]$//; |
$value=~s/[\r\n]$//; |
} |
} |
if (ref($fields) eq 'ARRAY') { |
if (ref($fields) eq 'ARRAY') { |
Line 296 sub sso_login {
|
Line 297 sub sso_login {
|
my $query = $r->args; |
my $query = $r->args; |
my %form; |
my %form; |
if ($query) { |
if ($query) { |
my @items = ('role','symb','iptoken'); |
my @items = ('role','symb','iptoken','origurl','logtoken'); |
&Apache::loncommon::get_unprocessed_cgi($query,\@items); |
&Apache::loncommon::get_unprocessed_cgi($query,\@items); |
foreach my $item (@items) { |
foreach my $item (@items) { |
if (defined($env{'form.'.$item})) { |
if (defined($env{'form.'.$item})) { |
Line 314 sub sso_login {
|
Line 315 sub sso_login {
|
} |
} |
} |
} |
|
|
|
# |
|
# If Shibboleth auth is in use, and a dual SSO and non-SSO login page |
|
# is in use, then the query string will contain the logtoken item with |
|
# a value set to the name of a .tmp file in /home/httpd/perl/tmp |
|
# containing the url to display after authentication, and also, |
|
# optionally, role and symb. |
|
# |
|
# Otherwise the query string may contain role and symb. |
|
# |
|
|
|
if ($form{'logtoken'}) { |
|
my ($firsturl,@rest); |
|
my $lonhost = $r->dir_config('lonHostID'); |
|
my $tmpinfo = &Apache::lonnet::reply('tmpget:'.$form{'logtoken'},$lonhost); |
|
my $delete = &Apache::lonnet::tmpdel($form{'logtoken'}); |
|
unless (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost') || |
|
($tmpinfo eq 'no_such_host')) { |
|
(undef,$firsturl,@rest) = split(/&/,$tmpinfo); |
|
if ($firsturl ne '') { |
|
$firsturl = &unescape($firsturl); |
|
} |
|
foreach my $item (@rest) { |
|
my ($key,$value) = split(/=/,$item); |
|
$form{$key} = &unescape($value); |
|
} |
|
if ($form{'iptoken'}) { |
|
%sessiondata = &Apache::lonnet::tmpget($form{'iptoken'}); |
|
my $delete = &Apache::lonnet::tmpdel($form{'iptoken'}); |
|
} |
|
} |
|
} |
|
|
my $domain = $r->dir_config('lonSSOUserDomain'); |
my $domain = $r->dir_config('lonSSOUserDomain'); |
if ($domain eq '') { |
if ($domain eq '') { |
$domain = $r->dir_config('lonDefDomain'); |
$domain = $r->dir_config('lonDefDomain'); |
Line 340 sub sso_login {
|
Line 373 sub sso_login {
|
my $lowest_load; |
my $lowest_load; |
($otherserver,undef,undef,undef,$lowest_load) = &Apache::lonnet::choose_server($domain); |
($otherserver,undef,undef,undef,$lowest_load) = &Apache::lonnet::choose_server($domain); |
if ($lowest_load > 100) { |
if ($lowest_load > 100) { |
$otherserver = &Apache::lonnet::spareserver($lowest_load,$lowest_load,1,$domain); |
$otherserver = &Apache::lonnet::spareserver($r,$lowest_load,$lowest_load,1,$domain); |
} |
} |
if ($otherserver ne '') { |
if ($otherserver ne '') { |
my @hosts = &Apache::lonnet::current_machine_ids(); |
my @hosts = &Apache::lonnet::current_machine_ids(); |
Line 358 sub sso_login {
|
Line 391 sub sso_login {
|
foreach my $item (keys(%form)) { |
foreach my $item (keys(%form)) { |
$env{'form.'.$item} = $form{$item}; |
$env{'form.'.$item} = $form{$item}; |
} |
} |
unless ($form{'symb'}) { |
unless (($form{'symb'}) || ($form{'origurl'})) { |
unless (($r->uri eq '/adm/roles') || ($r->uri eq '/adm/sso')) { |
unless (($r->uri eq '/adm/roles') || ($r->uri eq '/adm/sso')) { |
$env{'form.origurl'} = $r->uri; |
$env{'form.origurl'} = $r->uri; |
} |
} |
Line 384 sub sso_login {
|
Line 417 sub sso_login {
|
'server' => $r->dir_config('lonHostID'), |
'server' => $r->dir_config('lonHostID'), |
'sso.login' => 1 |
'sso.login' => 1 |
); |
); |
foreach my $item ('role','symb','iptoken') { |
foreach my $item ('role','symb','iptoken','origurl') { |
if (exists($form{$item})) { |
if (exists($form{$item})) { |
$info{$item} = $form{$item}; |
$info{$item} = $form{$item}; |
|
} elsif ($sessiondata{$item} ne '') { |
|
$info{$item} = $sessiondata{$item}; |
} |
} |
} |
} |
unless ($info{'symb'}) { |
unless (($info{'symb'}) || ($info{'origurl'})) { |
unless (($r->uri eq '/adm/roles') || ($r->uri eq '/adm/sso')) { |
unless (($r->uri eq '/adm/roles') || ($r->uri eq '/adm/sso')) { |
$info{'origurl'} = $r->uri; |
$info{'origurl'} = $r->uri; |
} |
} |
Line 431 sub sso_login {
|
Line 466 sub sso_login {
|
$r->subprocess_env->set('SSOUserUnknown' => $user); |
$r->subprocess_env->set('SSOUserUnknown' => $user); |
$r->subprocess_env->set('SSOUserDomain' => $domain); |
$r->subprocess_env->set('SSOUserDomain' => $domain); |
if (grep(/^sso$/,@cancreate)) { |
if (grep(/^sso$/,@cancreate)) { |
|
#FIXME - need to preserve origurl, role and symb for use after account |
|
# creation |
$r->set_handlers('PerlHandler'=> [\&Apache::createaccount::handler]); |
$r->set_handlers('PerlHandler'=> [\&Apache::createaccount::handler]); |
$r->handler('perl-script'); |
$r->handler('perl-script'); |
} else { |
} else { |
Line 470 sub handler {
|
Line 507 sub handler {
|
if ($handle eq '') { |
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{^/public/$match_domain/$match_courseid/syllabus}) || |
($requrl =~ m{^/adm/help/}) || |
($requrl =~ m{^/adm/help/}) || ($requrl eq '/adm/sso') || |
($requrl =~ m{^/res/$match_domain/$match_username/})) { |
($requrl =~ m{^/res/$match_domain/$match_username/})) { |
$r->log_reason("Cookie not valid", $r->filename); |
$r->log_reason("Cookie not valid", $r->filename); |
} |
} |
Line 549 sub handler {
|
Line 586 sub handler {
|
my $hostname = $r->hostname(); |
my $hostname = $r->hostname(); |
my $lonhost = &Apache::lonnet::host_from_dns($hostname); |
my $lonhost = &Apache::lonnet::host_from_dns($hostname); |
if ($lonhost) { |
if ($lonhost) { |
my $actual = &Apache::lonnet::absolute_url($hostname); |
my $actual = &Apache::lonnet::absolute_url($hostname,1,1); |
my $exphostname = &Apache::lonnet::hostname($lonhost); |
|
my $expected = $Apache::lonnet::protocol{$lonhost}.'://'.$hostname; |
my $expected = $Apache::lonnet::protocol{$lonhost}.'://'.$hostname; |
unless ($actual eq $expected) { |
unless ($actual eq $expected) { |
$env{'request.use_absolute'} = $expected; |
$env{'request.use_absolute'} = $expected; |
Line 595 sub handler {
|
Line 631 sub handler {
|
} |
} |
} |
} |
} |
} |
if ($requrl=~m{^/+tiny/+$match_domain/+\w+$}) { |
|
if ($env{'user.name'} eq 'public' && |
|
$env{'user.domain'} eq 'public') { |
|
$env{'request.firsturl'}=$requrl; |
|
return FORBIDDEN; |
|
} else { |
|
return OK; |
|
} |
|
} |
|
|
|
# ---------------------------------------------------------------- Check access |
# ---------------------------------------------------------------- Check access |
my $now = time; |
my $now = time; |
Line 616 sub handler {
|
Line 643 sub handler {
|
if (($requrl eq '/adm/viewclasslist') || |
if (($requrl eq '/adm/viewclasslist') || |
($requrl =~ m{^(/adm/wrapper|)\Q/uploaded/$cdom/$cnum/docs/\E}) || |
($requrl =~ m{^(/adm/wrapper|)\Q/uploaded/$cdom/$cnum/docs/\E}) || |
($requrl =~ m{^/adm/.*/aboutme$}) || |
($requrl =~ m{^/adm/.*/aboutme$}) || |
($requrl=~m{^/adm/coursedocs/showdoc/}) || |
($requrl=~m{^/adm/coursedocs/showdoc/})) { |
($requrl=~m{^(/adm/wrapper|)/adm/$cdom/$cnum/\d+/ext\.tool$})) { |
|
$check_block = 1; |
$check_block = 1; |
} |
} |
} |
} |
Line 630 sub handler {
|
Line 656 sub handler {
|
($requrl=~m|\.problem/smpedit$|) || |
($requrl=~m|\.problem/smpedit$|) || |
($requrl=~/^\/public\/.*\/syllabus$/) || |
($requrl=~/^\/public\/.*\/syllabus$/) || |
($requrl=~/^\/adm\/(viewclasslist|navmaps)$/) || |
($requrl=~/^\/adm\/(viewclasslist|navmaps)$/) || |
($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/) || |
($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/)) { |
($requrl=~m{^/adm/$cdom/$cnum/\d+/ext\.tool$})) { |
|
$check_symb = 1; |
$check_symb = 1; |
} |
} |
} |
} |
Line 673 sub handler {
|
Line 698 sub handler {
|
$access=&Apache::lonnet::allowed('bre',$requrl,'','','','',1); |
$access=&Apache::lonnet::allowed('bre',$requrl,'','','','',1); |
} |
} |
} else { |
} else { |
$access=&Apache::lonnet::allowed('bre',$requrl); |
my $clientip = &Apache::lonnet::get_requestor_ip($r); |
|
$access=&Apache::lonnet::allowed('bre',$requrl,'','',$clientip); |
} |
} |
} |
} |
if ($check_block) { |
if ($check_block) { |
Line 686 sub handler {
|
Line 712 sub handler {
|
&Apache::blockedaccess::setup_handler($r); |
&Apache::blockedaccess::setup_handler($r); |
return OK; |
return OK; |
} |
} |
} elsif ($check_access) { |
} elsif ($check_access) { |
if ($handle eq '') { |
if ($handle eq '') { |
unless ($access eq 'F') { |
unless ($access eq 'F') { |
if ($requrl =~ m{^/res/$match_domain/$match_username/}) { |
if ($requrl =~ m{^/res/$match_domain/$match_username/}) { |