version 1.181, 2020/10/01 10:16:33
|
version 1.182, 2020/10/06 17:26:15
|
Line 633 sub handler {
|
Line 633 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 811 sub handler {
|
Line 812 sub handler {
|
unless (&Apache::lonnet::symbverify($symb,$requrl,\$encstate)) { |
unless (&Apache::lonnet::symbverify($symb,$requrl,\$encstate)) { |
$invalidsymb = 1; |
$invalidsymb = 1; |
# |
# |
# If $env{'request.enc'} is true, but no encryption for $symb retrieved |
# If $env{'request.enc'} inconsistent with encryption expected for $symb |
# by original lonnet::symbread() call, call again to check for an instance |
# retrieved by lonnet::symbread(), call again to check for an instance of |
# of $requrl in the course which has encryption, and set that as the symb. |
# $requrl in the course for which expected encryption matches request.enc. |
# If there is no such symb, or symbverify() fails for the new symb proceed |
# If symb for different instance passes lonnet::symbverify(), use that as |
# to report invalid symb. |
# the symb for $requrl and call &Apache::lonnet::allowed() for that symb. |
|
# Report invalid symb if there is no other symb. Redirect to /adm/ambiguous |
|
# if multiple possible symbs consistent with request.enc available for $requrl. |
# |
# |
if ($env{'request.enc'} && !$encstate) { |
if (($env{'request.enc'} && !$encstate) || (!$env{'request.enc'} && $encstate)) { |
my %possibles; |
my %possibles; |
my $nocache = 1; |
my $nocache = 1; |
|
my $oldsymb = $symb; |
$symb = &Apache::lonnet::symbread($requrl,'','','',\%possibles,$nocache); |
$symb = &Apache::lonnet::symbread($requrl,'','','',\%possibles,$nocache); |
if ($symb) { |
if (($symb) && ($symb ne $oldsymb)) { |
if (&Apache::lonnet::symbverify($symb,$requrl)) { |
if (&Apache::lonnet::symbverify($symb,$requrl)) { |
$invalidsymb = ''; |
my $access=&Apache::lonnet::allowed('bre',$requrl,$symb); |
|
if ($access eq 'B') { |
|
$env{'request.symb'} = $symb; |
|
&Apache::blockedaccess::setup_handler($r); |
|
return OK; |
|
} elsif (($access eq '2') || ($access eq 'F')) { |
|
$invalidsymb = ''; |
|
} |
} |
} |
} elsif (keys(%possibles) > 1) { |
} elsif (keys(%possibles) > 1) { |
$r->internal_redirect('/adm/ambiguous'); |
$r->internal_redirect('/adm/ambiguous'); |