--- loncom/auth/lonacc.pm 2023/01/23 00:32:03 1.159.2.21.2.4 +++ loncom/auth/lonacc.pm 2023/08/28 20:40:00 1.210 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.159.2.21.2.4 2023/01/23 00:32:03 raeburn Exp $ +# $Id: lonacc.pm,v 1.210 2023/08/28 20:40:00 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -160,7 +160,7 @@ sub get_posted_cgi { if (length($value) == 1) { $value=~s/[\r\n]$//; } - } + } if ($fname =~ /\.(xls|doc|ppt)(x|m)$/i) { $value=~s/[\r\n]$//; } @@ -204,6 +204,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 { @@ -306,7 +314,6 @@ sub sso_login { my $query = $r->args; my %form; if ($query) { - my @items = ('role','symb','iptoken','origurl','ttoken', 'ltoken','linkkey','logtoken','sso','lcssowin'); &Apache::loncommon::get_unprocessed_cgi($query,\@items); @@ -326,7 +333,8 @@ sub sso_login { } } - my ($linkprot,$linkprotuser,$linkprotexit,$linkkey,$deeplinkurl); + my ($linkprot,$linkprotuser,$linkprotexit,$linkkey,$deeplinkurl, + $linkprotpbid,$linkprotpburl); # # If Shibboleth auth is in use, and a dual SSO and non-SSO login page @@ -366,6 +374,8 @@ sub sso_login { $linkprot = $info{'linkprot'}; $linkprotuser = $info{'linkprotuser'}; $linkprotexit = $info{'linkprotexit'}; + $linkprotpbid = $info{'linkprotpbid'}; + $linkprotpburl = $info{'linkprotpburl'}; } elsif ($info{'linkkey'} ne '') { $linkkey = $info{'linkkey'}; } @@ -394,6 +404,8 @@ sub sso_login { $linkprot = $form{'linkprot'}; $linkprotuser = $form{'linkprotuser'}; $linkprotexit = $form{'linkprotexit'}; + $linkprotpbid = $form{'linkprotpbid'}; + $linkprotpburl = $form{'linkprotpburl'}; } elsif ($form{'linkkey'} ne '') { $linkkey = $form{'linkkey'}; } @@ -423,6 +435,8 @@ sub sso_login { $linkprot = $form{'linkprot'}; $linkprotuser = $form{'linkprotuser'}; $linkprotexit = $form{'linkprotexit'}; + $linkprotpbid = $form{'linkprotpbid'}; + $linkprotpburl = $form{'linkprotpburl'}; } elsif ($form{'linkkey'} ne '') { $linkkey = $form{'linkkey'}; } @@ -437,6 +451,12 @@ sub sso_login { if ($link_info{'linkprotexit'} ne '') { $linkprotexit = $link_info{'linkprotexit'}; } + if ($link_info{'linkprotpbid'} ne '') { + $linkprotpbid = $link_info{'linkprotpbid'}; + } + if ($link_info{'linkprotpburl'} ne '') { + $linkprotpburl = $link_info{'linkprotpburl'}; + } } my $delete = &Apache::lonnet::tmpdel($form{'ltoken'}); delete($form{'ltoken'}); @@ -459,6 +479,8 @@ sub sso_login { linkprot => $linkprot, linkprotuser => $linkprotuser, linkprotexit => $linkprotexit, + linkprotpbid => $linkprotpbid, + linkprotpburl => $linkprotpburl, ); if ($env{'form.lcssowin'}) { $data{'lcssowin'} = $env{'form.lcssowin'}; @@ -531,6 +553,12 @@ sub sso_login { if ($linkprotexit ne '') { $env{'request.linkprotexit'} = $linkprotexit; } + if ($linkprotpbid ne '') { + $env{'request.linkprotpbid'} = $linkprotpbid; + } + if ($linkprotpburl ne '') { + $env{'request.linkprotpburl'} = $linkprotpburl; + } } elsif ($linkkey ne '') { $env{'request.linkkey'} = $linkkey; } @@ -558,7 +586,7 @@ sub sso_login { } else { # need to login them in, so generate the need data that # migrate expects to do login - my $ip = &Apache::lonnet::get_requestor_ip($r); + my $ip = &Apache::lonnet::get_requestor_ip($r); my %info=('ip' => $ip, 'domain' => $domain, 'username' => $user, @@ -591,6 +619,12 @@ sub sso_login { if ($linkprotexit ne '') { $info{'linkprotexit'} = $linkprotexit; } + if ($linkprotpbid ne '') { + $info{'linkprotpbid'} = $linkprotpbid; + } + if ($linkprotpburl ne '') { + $info{'linkprotpburl'} = $linkprotpburl; + } } elsif ($linkkey ne '') { $info{'linkkey'} = $linkkey; } @@ -735,7 +769,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)) { @@ -757,6 +792,7 @@ sub handler { my $lonhost = &Apache::lonnet::host_from_dns($hostname); if ($lonhost) { my $actual = &Apache::lonnet::absolute_url($hostname,1,1); + my $exphostname = &Apache::lonnet::hostname($lonhost); my $expected = $Apache::lonnet::protocol{$lonhost}.'://'.$hostname; unless ($actual eq $expected) { $env{'request.use_absolute'} = $expected; @@ -815,6 +851,8 @@ sub handler { linkprot => $info{'linkprot'}, linkprotuser => $info{'linkprotuser'}, linkprotexit => $info{'linkprotexit'}, + linkprotpbid => $info{'linkprotpbid'}, + linkprotpburl => $info{'linkprotpburl'}, ); } elsif ($info{'ltoken'} ne '') { my %ltoken_info = &Apache::lonnet::tmpget($info{'ltoken'}); @@ -825,6 +863,8 @@ sub handler { linkprot => $ltoken_info{'linkprot'}, linkprotuser => $ltoken_info{'linkprotuser'}, linkprotexit => $ltoken_info{'linkprotexit'}, + linkprotpbid => $ltoken_info{'linkprotpbid'}, + linkprotpburl => $ltoken_info{'linkprotpburl'}, ); } } @@ -851,6 +891,17 @@ sub handler { return FORBIDDEN; } return OK; + } elsif (($env{'request.course.id'}) && + (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) && + ($requrl=~m{^(/daxeopen|)(/uploaded/$cdom/$cnum/(?:docs|supplemental)/(?:default|\d+)/\d+/)([^/]+|)$})) { + my ($daxe,$path,$file) = ($1,$2,$3); + my $referrer; + unless ($daxe) { + $referrer = $r->headers_in->{'Referer'}; + } + if (($daxe) || ($referrer =~ m{\Qfile=/daxeopen$path\E})) { + return OK; + } } # ---------------------------------------------------------------- Check access my $now = time; @@ -924,18 +975,25 @@ sub handler { } } else { my $nodeeplinkcheck; - if (($check_access) && ($requrl =~ /\.(sequence|page)$/)) { - unless ($env{'form.navmap'}) { - if ($r->args ne '') { - &Apache::loncommon::get_unprocessed_cgi($r->args,['navmap']); - unless ($env{'form.navmap'}) { - $nodeeplinkcheck = 1; + if ($check_access) { + if ($requrl =~ m{^/daxeopen/priv/}) { + $nodeeplinkcheck = 1; + } elsif ($requrl =~ /\.(sequence|page)$/) { + unless ($env{'form.navmap'}) { + if ($r->args ne '') { + &Apache::loncommon::get_unprocessed_cgi($r->args,['navmap']); + unless ($env{'form.navmap'}) { + $nodeeplinkcheck = 1; + } } } } } my $clientip = &Apache::lonnet::get_requestor_ip($r); $access=&Apache::lonnet::allowed('bre',$requrl,'','',$clientip,'','',$nodeeplinkcheck); + if (($requrl =~ m{^/daxeopen/priv/}) && ($access eq '')) { + $env{'request.editurl'}=$requrl; + } } } if ($check_block) { @@ -948,7 +1006,7 @@ sub handler { &Apache::blockedaccess::setup_handler($r); return OK; } - } elsif ($check_access) { + } elsif ($check_access) { if ($handle eq '') { unless ($access eq 'F') { if ($requrl =~ m{^/res/$match_domain/$match_username/}) { @@ -1148,8 +1206,8 @@ sub handler { 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]); } } } @@ -1202,7 +1260,7 @@ sub handler { # ------------------------------------ See if this is a viewable portfolio file if (&Apache::lonnet::is_portfolio_url($requrl)) { my $clientip = &Apache::lonnet::get_requestor_ip($r); - 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;