--- loncom/auth/lonacc.pm 2021/01/02 22:11:26 1.159.2.17 +++ loncom/auth/lonacc.pm 2020/09/28 00:10:27 1.179 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.159.2.17 2021/01/02 22:11:26 raeburn Exp $ +# $Id: lonacc.pm,v 1.179 2020/09/28 00:10:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -102,6 +102,7 @@ use Apache::loncommon(); use Apache::lonlocal; use Apache::restrictedaccess(); use Apache::blockedaccess(); +use Apache::lonprotected(); use Fcntl qw(:flock); use LONCAPA qw(:DEFAULT :match); @@ -202,6 +203,14 @@ sub get_posted_cgi { $fname=''; $fmime=''; } + if ($i<$#lines && $lines[$i+1]=~/^Content\-Type\:\s*([\w\-\/]+)/i) { + # TODO: something with $1 ! + $i++; + } + if ($i<$#lines && $lines[$i+1]=~/^Content\-transfer\-encoding\:\s*([\w\-\/]+)/i) { + # TODO: something with $1 ! + $i++; + } $i++; } } else { @@ -355,6 +364,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'} = @@ -369,7 +386,7 @@ sub sso_login { } else { # need to login them in, so generate the need data that # migrate expects to do login - my $ip = $r->get_remote_host(); + my $ip = $r->get_remote_host(); my %info=('ip' => $ip, 'domain' => $domain, 'username' => $user, @@ -435,6 +452,22 @@ sub sso_login { return undef; } +sub needs_symb_check { + my ($requrl) = @_; + $requrl=~/\.(\w+)$/; + if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') || + ($requrl=~/^\/adm\/.*\/(aboutme|smppg|bulletinboard)(\?|$ )/x) || + ($requrl=~/^\/adm\/wrapper\//) || + ($requrl=~m|^/adm/coursedocs/showdoc/|) || + ($requrl=~m|\.problem/smpedit$|) || + ($requrl=~/^\/public\/.*\/syllabus$/) || + ($requrl=~/^\/adm\/(viewclasslist|navmaps)$/) || + ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/)) { + return 1; + } + return; +} + sub handler { my $r = shift; my $requrl=$r->uri; @@ -520,7 +553,8 @@ sub handler { } } elsif ($env{'request.course.id'} && (($requrl =~ m{^/adm/$match_domain/$match_username/aboutme$}) || - ($requrl =~ m{^/public/$cdom/$cnum/syllabus$}))) { + ($requrl eq "/public/$cdom/$cnum/syllabus") || + ($requrl =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}))) { my $query = $r->args; if ($query) { foreach my $pair (split(/&/,$query)) { @@ -529,7 +563,6 @@ sub handler { if ($value =~ /^supplemental/) { $suppext = 1; } - last; } } } @@ -542,6 +575,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; @@ -563,81 +597,60 @@ sub handler { if ($env{'user.noloadbalance'} eq $r->dir_config('lonHostID')) { $checkexempt = 1; } - unless (($checkexempt) || (($requrl eq '/adm/switchserver') && (!$r->is_initial_req()))) { + unless ($checkexempt) { ($is_balancer,$otherserver) = &Apache::lonnet::check_loadbalancing($env{'user.name'}, $env{'user.domain'}); 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$env{'user.domain'}\E_\Q$env{'user.name'}\E_/)) { - $otherserver = $found_server; - } - unless ($requrl eq '/adm/switchserver') { - $r->set_handlers('PerlResponseHandler'=> - [\&Apache::switchserver::handler]); + 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) { + 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; - } + } + 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+$}) { + if ($env{'user.name'} eq 'public' && + $env{'user.domain'} eq 'public') { + $env{'request.firsturl'}=$requrl; + return FORBIDDEN; + } else { + return OK; } } - # ---------------------------------------------------------------- Check access my $now = time; - my ($check_symb,$check_access,$check_block,$access,$poss_symb); if ($requrl !~ m{^/(?:adm|public|(?:prt|zip)spool)/} || $requrl =~ /^\/adm\/.*\/(smppg|bulletinboard)(\?|$ )/x) { - $check_access = 1; - } - if ((!$check_access) && ($env{'request.course.id'})) { - if (($requrl eq '/adm/viewclasslist') || - ($requrl =~ m{^(/adm/wrapper|)\Q/uploaded/$cdom/$cnum/docs/\E}) || - ($requrl =~ m{^/adm/.*/aboutme$}) || - ($requrl=~m{^/adm/coursedocs/showdoc/})) { - $check_block = 1; - } - } - if (($env{'request.course.id'}) && (!$suppext)) { - $requrl=~/\.(\w+)$/; - if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') || - ($requrl=~/^\/adm\/.*\/(aboutme|smppg|bulletinboard)(\?|$ )/x) || - ($requrl=~/^\/adm\/wrapper\//) || - ($requrl=~m|^/adm/coursedocs/showdoc/|) || - ($requrl=~m|\.problem/smpedit$|) || - ($requrl=~/^\/public\/.*\/syllabus$/) || - ($requrl=~/^\/adm\/(viewclasslist|navmaps)$/) || - ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/)) { - $check_symb = 1; - } - } - if (($check_access) || ($check_block)) { - if ($check_symb) { + my ($access,$poss_symb); + if (($env{'request.course.id'}) && (!$suppext) && (&needs_symb_check($requrl))) { + unless ($env{'form.symb'}) { + if ($r->args) { + &Apache::loncommon::get_unprocessed_cgi($r->args,['symb']); + } + } if ($env{'form.symb'}) { $poss_symb=&Apache::lonnet::symbclean($env{'form.symb'}); - } elsif (($env{'request.course.id'}) && ($r->args ne '')) { - my $query = $r->args; - foreach my $pair (split(/&/,$query)) { - my ($name, $value) = split(/=/,$pair); - $name = &unescape($name); - $value =~ tr/+/ /; - $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - if ($name eq 'symb') { - $poss_symb = &Apache::lonnet::symbclean($value); - last; - } - } } if ($poss_symb) { my ($possmap,$resid,$url)=&Apache::lonnet::decode_symb($poss_symb); $url = &Apache::lonnet::clutter($url); - my $toplevelmap = $env{'course.'.$env{'request.course.id'}.'.url'}; - unless (($url eq $requrl) && (($possmap eq $toplevelmap) || - (&Apache::lonnet::is_on_map($possmap)))) { + unless (($url eq $requrl) && (&Apache::lonnet::is_on_map($possmap))) { undef($poss_symb); } if ($poss_symb) { @@ -655,18 +668,6 @@ sub handler { } else { $access=&Apache::lonnet::allowed('bre',$requrl); } - } - if ($check_block) { - if ($access eq 'B') { - if ($poss_symb) { - if (&Apache::lonnet::symbverify($poss_symb,$requrl)) { - $env{'request.symb'} = $poss_symb; - } - } - &Apache::blockedaccess::setup_handler($r); - return OK; - } - } elsif ($check_access) { if ($handle eq '') { unless ($access eq 'F') { if ($requrl =~ m{^/res/$match_domain/$match_username/}) { @@ -684,6 +685,9 @@ sub handler { } if ($access eq 'B') { if ($poss_symb) { + if ($requrl=~m{^(/adm/.*/aboutme)/portfolio$}) { + $requrl = $1; + } if (&Apache::lonnet::symbverify($poss_symb,$requrl)) { $env{'request.symb'} = $poss_symb; } @@ -691,6 +695,10 @@ sub handler { &Apache::blockedaccess::setup_handler($r); return OK; } + if ($access eq 'D') { + &Apache::lonprotected::setup_handler($r); + return OK; + } if (($access ne '2') && ($access ne 'F')) { if ($requrl =~ m{^/res/}) { $access = &Apache::lonnet::allowed('bro',$requrl); @@ -738,7 +746,7 @@ sub handler { $env{'user.domain'} eq 'public' && $requrl !~ m{^/+(res|public|uploaded)/} && $requrl !~ m{^/adm/[^/]+/[^/]+/aboutme/portfolio$ }x && - $requrl !~ m{^/adm/blockingstatus/.*$} && + $requrl !~ m{^/adm/blockingstatus/.*$} && $requrl !~ m{^/+adm/(help|logout|restrictedaccess|randomlabel\.png)}) { $env{'request.querystring'}=$r->args; $env{'request.firsturl'}=$requrl; @@ -748,7 +756,7 @@ sub handler { if ($env{'request.course.id'}) { &Apache::lonnet::countacc($requrl); my $query=$r->args; - if ($check_symb) { + if (&needs_symb_check($requrl)) { # ------------------------------------- This is serious stuff, get symb and log my $symb; if ($query) { @@ -756,15 +764,15 @@ sub handler { } if ($env{'form.symb'}) { $symb=&Apache::lonnet::symbclean($env{'form.symb'}); - if ($requrl eq '/adm/navmaps') { + 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/| + } 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); + ($map,$mid,$murl)=&Apache::lonnet::decode_symb($mapsymb); } &Apache::lonnet::symblist($map,$murl => [$murl,$mid], 'last_known' =>[$murl,$mid]); @@ -791,62 +799,54 @@ sub handler { if ($requrl=~m{^(/adm/.*/aboutme)/portfolio$}) { $requrl = $1; } - $symb=&Apache::lonnet::symbread($requrl); - if (&Apache::lonnet::is_on_map($requrl) && $symb) { - my ($encstate,$invalidsymb); - unless (&Apache::lonnet::symbverify($symb,$requrl,\$encstate)) { - $invalidsymb = 1; - # - # If $env{'request.enc'} inconsistent with encryption expected for $symb - # retrieved by lonnet::symbread(), call again to check for an instance of - # $requrl in the course for which expected encryption matches request.enc. - # If symb for different instance passes lonnet::symbverify(), use that as - # 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) || (!$env{'request.enc'} && $encstate)) { - my %possibles; - my $nocache = 1; - my $oldsymb = $symb; - $symb = &Apache::lonnet::symbread($requrl,'','','',\%possibles,$nocache); - if (($symb) && ($symb ne $oldsymb)) { - if (&Apache::lonnet::symbverify($symb,$requrl)) { - 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')) { + unless ($suppext) { + $symb=&Apache::lonnet::symbread($requrl); + if (&Apache::lonnet::is_on_map($requrl) && $symb) { + my ($encstate,$invalidsymb); + unless (&Apache::lonnet::symbverify($symb,$requrl,\$encstate)) { + $invalidsymb = 1; + # + # If $env{'request.enc'} is true, but no encryption for $symb retrieved + # by original lonnet::symbread() call, call again to check for an instance + # of $requrl in the course which has encryption, and set that as the symb. + # If there is no such symb, or symbverify() fails for the new symb proceed + # to report invalid symb. + # + if ($env{'request.enc'} && !$encstate) { + my %possibles; + my $nocache = 1; + $symb = &Apache::lonnet::symbread($requrl,'','','',\%possibles,$nocache); + if ($symb) { + if (&Apache::lonnet::symbverify($symb,$requrl)) { $invalidsymb = ''; } + } elsif (keys(%possibles) > 1) { + $r->internal_redirect('/adm/ambiguous'); + return OK; } - } elsif (keys(%possibles) > 1) { - $r->internal_redirect('/adm/ambiguous'); - return OK; } - } - if ($invalidsymb) { - $r->log_reason('Invalid symb for '.$requrl.': '.$symb); - $env{'user.error.msg'}= - "$requrl:bre:1:1:Invalid Access"; - return HTTP_NOT_ACCEPTABLE; + if ($invalidsymb) { + $r->log_reason('Invalid symb for '.$requrl.': '.$symb); + $env{'user.error.msg'}= + "$requrl:bre:1:1:Invalid Access"; + return HTTP_NOT_ACCEPTABLE; + } } } - } - if ($symb) { - my ($map,$mid,$murl)= - &Apache::lonnet::decode_symb($symb); - 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); + if ($symb) { + my ($map,$mid,$murl)= + &Apache::lonnet::decode_symb($symb); + 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]); } - &Apache::lonnet::symblist($map,$murl =>[$murl,$mid], - 'last_known' =>[$murl,$mid]); - } + } } } $env{'request.symb'}=$symb; @@ -898,7 +898,7 @@ sub handler { # ------------------------------------ See if this is a viewable portfolio file if (&Apache::lonnet::is_portfolio_url($requrl)) { my $clientip = $r->get_remote_host(); - my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip); + my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip); if ($access eq 'A') { &Apache::restrictedaccess::setup_handler($r); return OK;