--- loncom/interface/lontiny.pm 2022/05/25 18:03:43 1.10 +++ loncom/interface/lontiny.pm 2024/11/17 04:48:15 1.23 @@ -2,7 +2,7 @@ # Extract domain, courseID, and symb from a shortened URL, # and switch role to a role in designated course. # -# $Id: lontiny.pm,v 1.10 2022/05/25 18:03:43 raeburn Exp $ +# $Id: lontiny.pm,v 1.23 2024/11/17 04:48:15 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -68,9 +68,38 @@ sub handler { my $chome = &Apache::lonnet::homeserver($cnum,$cdom); if ($chome ne 'no_host') { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['ttoken']); + my ($linkprot,$linkprotuser,$linkprotexit,$ltoken,$linkprotpbid,$linkprotpburl); + if ($env{'form.ttoken'}) { + my %link_info = &Apache::lonnet::tmpget($env{'form.ttoken'}); + if ($link_info{'origurl'} eq $r->uri) { + if ($link_info{'ltoken'}) { + $ltoken = $link_info{'ltoken'}; + my %ltoken_info = &Apache::lonnet::tmpget($link_info{'ltoken'}); + $linkprot = $ltoken_info{'linkprot'}; + $linkprotuser = $ltoken_info{'linkprotuser'}; + $linkprotexit = $ltoken_info{'linkprotexit'}; + $linkprotpbid = $ltoken_info{'linkprotpbid'}; + $linkprotpburl = $ltoken_info{'linkprotpburl'}; + } elsif ($link_info{'linkprot'}) { + $linkprot = $link_info{'linkprot'}; + if ($link_info{'linkprotuser'}) { + $linkprotuser = $link_info{'linkprotuser'}; + } + if ($link_info{'linkprotexit'}) { + $linkprotexit = $link_info{'linkprotexit'}; + } + if ($link_info{'linkprotpbid'}) { + $linkprotpbid = $link_info{'linkprotpbid'}; + } + if ($link_info{'linkprotpburl'}) { + $linkprotpburl = $link_info{'linkprotpburl'}; + } + } + } + } if ($env{'request.course.id'} eq $cdom.'_'.$cnum) { # Check for ttoken - my $newlauncher = &launch_check($r->uri,$symb); + my $newlauncher = &launch_check($r->uri,$symb,$cdom,$cnum); my ($map,$resid,$url) = &Apache::lonnet::decode_symb($symb); if (&Apache::lonnet::is_on_map($url)) { my $realuri; @@ -97,14 +126,14 @@ sub handler { $realuri .= '?symb='.$symb; } } - my $update; + my ($update,$reinitresult); # Check if course needs to be re-initialized if ($newlauncher) { $update = 1; } else { my $loncaparev = $r->dir_config('lonVersion'); - my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev); - if ($result eq 'update') { + ($reinitresult,my @reinit) = &Apache::loncommon::needs_coursereinit($loncaparev); + if (($reinitresult eq 'main') || ($reinitresult eq 'both')) { $update = 1; } elsif (!-e $env{'request.course.fn'}.'.db') { $update = 1; @@ -134,6 +163,16 @@ sub handler { return HTTP_NOT_ACCEPTABLE; } } + if (($reinitresult eq 'both') || ($reinitresult eq 'supp')) { + my $possdel; + if ($reinitresult eq 'supp') { + $possdel = 1; + } + my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom,'',$possdel); + unless ($refs_updated) { + &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental,$possdel); + } + } my $host = $r->headers_in->get('Host'); if (!$host) { $r->internal_redirect($realuri); @@ -156,22 +195,39 @@ sub handler { } else { unshift(@possroles,'cc'); } - my %roleshash = &Apache::lonnet::get_my_roles($env{'user.uname'}, - $env{'user.domain'}, - 'userroles',undef, - \@possroles,[$cdom],1); - my (%possroles,$hassection); + my %roleshash = + &Apache::lonnet::get_my_roles($env{'user.uname'},$env{'user.domain'}, + 'userroles',['previous','active','future'], + \@possroles,[$cdom],1); + my (%possroles,$hassection,%active,%expired,%future); if (keys(%roleshash)) { + my $now = time; foreach my $entry (keys(%roleshash)) { if ($entry =~ /^\Q$cnum:$cdom:\E([^:]+):([^:]*)$/) { - $possroles{$1} = $2; - if ($2 ne '') { + my ($role,$sec) = ($1,$2); + $possroles{$role} = $sec; + if ($sec ne '') { $hassection = 1; } + my ($tstart,$tend)=split(/\:/,$roleshash{$entry}); + my $status = 'active'; + if (($tend) && ($tend<=$now)) { + $status = 'previous'; + } + if (($tstart) && ($now<$tstart)) { + $status = 'future'; + } + if ($status eq 'active') { + $active{$role} = $sec; + } elsif ($status eq 'previous') { + $expired{$tend} = $role.':'.$sec; + } elsif ($status eq 'future') { + $future{$tstart} = $role.':'.$sec; + } } } } - my @allposs = keys(%possroles); + my @allposs = keys(%active); if ($env{'request.lti.login'}) { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); if ($env{'request.lti.target'} eq '') { @@ -188,7 +244,7 @@ sub handler { } if ($env{"form.$newrole"}) { my $destination .= '/adm/roles?selectrole=1&'.$newrole.'=1'. - '&destinationurl='.&HTML::Entities::encode($r->uri); + '&destinationurl='.&HTML::Entities::encode($r->uri,'&<>"'); if ($env{'form.ltitarget'} eq 'iframe') { $destination .= '<itarget=iframe'; } @@ -199,20 +255,21 @@ sub handler { } } if (@allposs == 0) { - &show_roles($r,\%crsenv,\%possroles); + &show_roles($r,\%crsenv,\%active,'','',\%future,\%expired,$linkprot,$linkprotuser, + $linkprotexit,$linkprotpbid,$linkprotpburl,$ltoken); } elsif (@allposs == 1) { my $newrole = "$allposs[0]./$cdom/$cnum"; $newrole = "$allposs[0]./$cdom/$cnum"; if ($possroles{$allposs[0]} ne '') { - $newrole .= "/$possroles{$allposs[0]}"; + $newrole .= "/$possroles{$allposs[0]}"; } my $destination .= '/adm/roles?selectrole=1&'.$newrole.'=1'. - '&destinationurl='.&HTML::Entities::encode($r->uri); + '&destinationurl='.&HTML::Entities::encode($r->uri,'&<>"'); if ($env{'form.ttoken'}) { $destination .= '&ttoken='.$env{'form.ttoken'}; } - &do_redirect($r,$destination); - } elsif (keys(%possroles) > 1) { + &do_redirect($r,$destination,$linkprot); + } elsif (@allposs > 1) { if (grep(/^(cc|co)$/,@allposs)) { my $newrole; if (exists($possroles{'cc'})) { @@ -222,17 +279,17 @@ sub handler { } $newrole .= "./$cdom/$cnum"; my $destination .= '/adm/roles?selectrole=1&'.$newrole.'=1'. - '&destinationurl='.&HTML::Entities::encode($r->uri); + '&destinationurl='.&HTML::Entities::encode($r->uri,'&<>"'); if ($env{'form.ttoken'}) { $destination .= '&ttoken='.$env{'form.ttoken'}; } - &do_redirect($r,$destination); + &do_redirect($r,$destination,$linkprot); } else { my $hascustom; if (grep(/^cr\//,@allposs)) { $hascustom = 1; } - &show_roles($r,\%crsenv,\%possroles,$hassection,$hascustom); + &show_roles($r,\%crsenv,\%active,$hassection,$hascustom); } } return OK; @@ -250,8 +307,9 @@ sub handler { } sub launch_check { - my ($linkuri,$symb) = @_; - my ($linkprotector,$linkproturi,$linkkey,$newlauncher); + my ($linkuri,$symb,$cdom,$cnum) = @_; + my ($linkprotector,$linkproturi,$linkprotexit,$linkprotpbid,$linkprotpburl, + $linkkey,$newlauncher,$prevlaunch); if ($env{'form.ttoken'}) { my %link_info = &Apache::lonnet::tmpget($env{'form.ttoken'}); &Apache::lonnet::tmpdel($env{'form.ttoken'}); @@ -265,8 +323,7 @@ sub launch_check { $link_info{'linkkey'} = $ltoken_info{'linkkey'}; } } - &Apache::lonnet::tmpdel($env{'form.ltoken'}); - delete($env{'form.ltoken'}); + &Apache::lonnet::tmpdel($link_info{'ltoken'}); } if ($link_info{'linkprot'}) { ($linkprotector,$linkproturi) = split(/:/,$link_info{'linkprot'},2); @@ -290,6 +347,15 @@ sub launch_check { } else { &Apache::lonnet::appenv({'user.linkproturi' => $linkproturi}); } + if ($link_info{'linkprotexit'}) { + $linkprotexit = $link_info{'linkprotexit'}; + } + if ($link_info{'linkprotpbid'}) { + $linkprotpbid = $link_info{'linkprotpbid'}; + } + if ($link_info{'linkprotpburl'}) { + $linkprotpburl = $link_info{'linkprotpburl'}; + } } elsif ($link_info{'linkkey'} ne '') { $linkkey = $link_info{'linkkey'}; my $keyedlinkuri = $linkuri; @@ -315,6 +381,9 @@ sub launch_check { if ($link_info{'checklaunch'}) { $newlauncher = 1; } + if ($link_info{'prevlaunch'} ne '') { + $prevlaunch = $link_info{'prevlaunch'}; + } } my $currdeeplinklogin = $env{'request.deeplink.login'}; my $deeplink; @@ -329,7 +398,7 @@ sub launch_check { } if ($deeplink ne '') { my $disallow; - my ($state,$others,$listed,$scope,$protect,$display,$target) = split(/,/,$deeplink); + my ($state,$others,$listed,$scope,$protect,$display,$target,$exit) = split(/,/,$deeplink); if (($protect ne 'none') && ($protect ne '')) { my ($acctype,$item) = split(/:/,$protect); if ($acctype =~ /lti(c|d)$/) { @@ -357,23 +426,69 @@ sub launch_check { if ($env{'request.deeplink.target'} ne '') { &Apache::lonnet::delenv('request.deeplink.target'); } + if ($env{'request.linkprot'} ne '') { + &Apache::lonnet::delenv('request.linkprot'); + } + if ($env{'request.linkprotexit'} ne '') { + &Apache::lonnet::delenv('request.linkprotexit'); + } + if ($env{'request.linkprotpbid'} ne '') { + &Apache::lonnet::delenv('request.linkprotpbid'); + } + if ($env{'request.linkprotpburl'} ne '') { + &Apache::lonnet::delenv('request.linkprotpburl'); + } } } else { unless ($currdeeplinklogin eq $linkuri) { if (($linkprotector) || ($linkkey ne '')) { - if ($linkprotector) { - &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi}); - } elsif ($env{'request.linkprot'}) { - &Apache::lonnet::delenv({'request.linkprot'}); - } - if ($linkkey ne '') { - &Apache::lonnet::appenv({'request.linkkey' => $linkkey}); - } elsif ($env{'request.linkkey'} ne '') { - &Apache::lonnet::delenv({'request.linkkey'}); - } $newlauncher = 1; } } + if ($linkprotector) { + &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi}); + if ($linkprotpburl && $linkprotpbid) { + my ($res,$error) = &store_passback_info($cdom,$cnum,$linkuri,$linkprotector, + $scope,$symb,$linkprotpbid,$linkprotpburl, + $currdeeplinklogin); + } + } elsif ($env{'request.linkprot'}) { + &Apache::lonnet::delenv('request.linkprot'); + } + if ($linkkey ne '') { + &Apache::lonnet::appenv({'request.linkkey' => $linkkey}); + } elsif ($env{'request.linkkey'} ne '') { + &Apache::lonnet::delenv('request.linkkey'); + } + if (($linkprotector) || ($linkkey ne '')) { + if ($linkprotexit ne $env{'request.linkprotexit'}) { + if ($linkprotexit) { + &Apache::lonnet::appenv({'request.linkprotexit' => $linkprotexit}); + } elsif ($env{'request.linkprotexit'}) { + &Apache::lonnet::delenv('request.linkprotexit'); + } + } + if ($linkprotpbid ne $env{'request.linkprotpbid'}) { + if ($linkprotpbid) { + &Apache::lonnet::appenv({'request.linkprotpbid' => $linkprotpbid}); + } elsif ($env{'request.linkprotpbid'}) { + &Apache::lonnet::delenv('request.linkprotpbid'); + } + } + if ($linkprotpburl ne $env{'request.linkprotpburl'}) { + if ($linkprotpburl) { + &Apache::lonnet::appenv({'request.linkprotpburl' => $linkprotpburl}); + } elsif ($env{'request.linkprotpburl'}) { + &Apache::lonnet::delenv('request.linkprotpburl'); + } + } + } elsif ($prevlaunch) { + foreach my $requestkey ('linkprotpbid','linkprotpburl','linkprotexit') { + if ($env{"request.$requestkey"}) { + &Apache::lonnet::delenv("request.$requestkey"); + } + } + } &Apache::lonnet::appenv({'request.deeplink.login' => $linkuri}); if ($target ne '') { &Apache::lonnet::appenv({'request.deeplink.target' => $target}); @@ -385,12 +500,27 @@ sub launch_check { if ($linkprotector) { &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi}); } elsif ($env{'request.linkprot'}) { - &Apache::lonnet::delenv({'request.linkprot'}); + &Apache::lonnet::delenv('request.linkprot'); + } + if ($linkprotexit) { + &Apache::lonnet::appenv({'request.linkprotexit' => $linkprotexit}); + } elsif ($env{'request.linkprotexit'}) { + &Apache::lonnet::delenv('request.linkprotexit'); + } + if ($linkprotpbid) { + &Apache::lonnet::appenv({'request.linkprotpbid' => $linkprotpbid}); + } elsif ($env{'request.linkprotpbid'}) { + &Apache::lonnet::delenv('request.linkprotpbid'); + } + if ($linkprotpburl) { + &Apache::lonnet::appenv({'request.linkprotpburl' => $linkprotpburl}); + } elsif ($env{'request.linkprotpburl'}) { + &Apache::lonnet::delenv('request.linkprotpburl'); } if ($linkkey ne '') { &Apache::lonnet::appenv({'request.linkkey' => $linkkey}); } else { - &Apache::lonnet::delenv({'request.linkkey'}); + &Apache::lonnet::delenv('request.linkkey'); } &Apache::lonnet::appenv({'request.deeplink.login' => $linkuri}); if ($env{'request.deeplink.target'} ne '') { @@ -400,29 +530,99 @@ sub launch_check { return $newlauncher; } +# +# Store linkprotpburl and linkprotpbid in user's nohist_$cid_linkprot_pb.db +# $linkuri\0$linkprotector\0$scope = [$linkprotpbid,$linkprotpburl] +# Separately store $symb in course's nohist_linkprot_passback.db +# which should trigger passback: +# $symb => {$linkuri\0$linkprotector\0$scope => 1}; +# + +sub store_passback_info { + my ($cdom,$cnum,$linkuri,$linkprotector,$scope,$symb, + $linkprotpbid,$linkprotpburl,$currdeeplinklogin) = @_; + my $key = join("\0",($linkuri,$linkprotector,$scope)); + my $namespace = 'nohist_'.$cdom.'_'.$cnum.'_linkprot_pb'; + if ($linkuri eq $currdeeplinklogin) { + my %pbinfo = &Apache::lonnet::get($namespace,[$key]); + if (ref($pbinfo{$key}) eq 'ARRAY') { + if (($pbinfo{$key}[0] eq $linkprotpbid) && + ($pbinfo{$key}[1] eq $linkprotpburl)) { + return ('ok'); + } + } + } + my $now = time; + my $result = &Apache::lonnet::cput($namespace,{$key => [$linkprotpbid,$linkprotpburl]}); + my $error; + if (($result eq 'ok') || ($result eq 'con_delayed')) { + $namespace = 'nohist_linkprot_passback'; + my %triggers = &Apache::lonnet::get($namespace,[$symb],$cdom,$cnum); + my $newtrigger; + if ((exists($triggers{$symb})) && (ref($triggers{$symb}) eq 'HASH')) { + unless (exists($triggers{$symb}{$key})) { + $newtrigger = 1; + } + } else { + $newtrigger = 1; + } + if ($newtrigger) { + my ($lockhash,$tries,$gotlock); + $lockhash = { + lock => $env{'user.name'}. + ':'.$env{'user.domain'}, + }; + $tries = 0; + $gotlock = &Apache::lonnet::newput($namespace,$lockhash,$cdom,$cnum); + while (($gotlock ne 'ok') && ($tries<10)) { + $tries ++; + sleep (0.1); + $gotlock = &Apache::lonnet::newput($namespace,$lockhash,$cdom,$cnum); + } + if ($gotlock eq 'ok') { + %triggers = &Apache::lonnet::get($namespace,[$symb],$cdom,$cnum); + $triggers{$symb}{$key} = 1; + $result = &Apache::lonnet::cput($namespace,{$symb => $triggers{$symb}},$cdom,$cnum); + my $dellockoutcome = &Apache::lonnet::del($namespace,['lock'],$cdom,$cnum); + } else { + $error = 'nolock'; + } + } + } + return ($result,$error); +} + sub do_redirect { - my ($r,$destination) = @_; + my ($r,$destination,$linkprot) = @_; my $windowname = 'loncapaclient'; if ($env{'request.lti.login'}) { $windowname .= 'lti'; } my $header = ''; my $args = {'bread_crumbs' => [{'href' => '','text' => 'Role initialization'},],}; + if ($linkprot) { + $args = {'only_body' => 1, + 'redirect' => [0,$destination],}; + } &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print(&Apache::loncommon::start_page('Valid link',$header,$args). - &Apache::lonhtmlcommon::scripttag('self.name="'.$windowname.'";'). - '

'.&mt('Welcome').'

'. - '

'.&mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','','').'

'. - ''.&mt('Continue').'

'. - &Apache::loncommon::end_page()); + if ($linkprot) { + $r->print(&Apache::loncommon::start_page('Valid link','',$args). + &Apache::loncommon::end_page()); + } else { + $r->print(&Apache::loncommon::start_page('Valid link',$header,$args). + &Apache::lonhtmlcommon::scripttag('self.name="'.$windowname.'";'). + '

'.&mt('Welcome').'

'. + '

'.&mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','','').'

'. + ''.&mt('Continue').'

'. + &Apache::loncommon::end_page()); + } return; } sub show_roles { - my ($r,$crsenv,$possroles,$hassection,$hascustom) = @_; - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; + my ($r,$crsenv,$possroles,$hassection,$hascustom,$futureroles,$expiredroles, + $linkprot,$linkprotuser,$linkprotexit,$linkprotpbid,$linkprotpburl,$ltoken) = @_; my ($crsdesc,$crstype,$cdom,$cnum,$header,$title,$preamble,$datatable,$js,$args); if (ref($crsenv) eq 'HASH') { $crsdesc = $crsenv->{'description'}; @@ -441,6 +641,9 @@ sub show_roles { if (ref($possroles) eq 'HASH') { if (keys(%{$possroles}) > 0) { $args = {'bread_crumbs' => [{'href' => '','text' => "Choose role in $lc_crstype"},],}; + if ($linkprot) { + $args = {'only_body' => 1}; + } $title = 'Choose a role'; #Do not localize. if ($crstype eq 'Community') { $preamble = &mt('You have the following active roles in this community:'); @@ -450,7 +653,7 @@ sub show_roles { $datatable = '
'. ''."\n". ''."\n". - ''."\n"; + ''."\n"; if ($env{'form.ttoken'}) { $datatable .= ''."\n"; } @@ -532,9 +735,57 @@ function enterrole (thisform,rolecode,bu ENDJS } else { - $title = 'No active role'; - $preamble = &mt("You have no active roles in this $lc_crstype so the page is currently unavailable to you."); - $args = {'bread_crumbs' => [{'href' => '','text' => 'Role status'},],}; + if ($linkprot) { + $title = 'No access'; + $preamble = '

'.&mt('Access unavailable for this LON-CAPA content.').'

'; + $args->{'only_body'} = 1; + } else { + $title = 'No active role'; + $preamble = '

'.&mt("You have no active roles in this $lc_crstype so the page is currently unavailable to you.").'

'; + $args = {'bread_crumbs' => [{'href' => '','text' => 'Role status'},],}; + } + $header = &mt('No access for: [_1]',''.&Apache::loncommon::plainname($env{'user.name'}, + $env{'user.domain'}).''); + if ((ref($futureroles) eq 'HASH') && (keys(%{$futureroles}) > 0)) { + my @future = sort { $a <=> $b } (keys(%{$futureroles})); + $preamble .= '

'.&mt('Access will begin: [_1].',&Apache::lonlocal::locallocaltime($future[0])). + ' '.&mt('Please try again then.').'

'; + } elsif ((ref($expiredroles) eq 'HASH') && (keys(%{$expiredroles}) > 0)) { + my @expired = sort { $b <=> $a } (keys(%{$expiredroles})); + $preamble .= '

'.&mt('Access ended: [_1].',&Apache::lonlocal::locallocaltime($expired[0])).'

'; + } elsif ($linkprot) { + if ($linkprotuser) { + my ($uname,$udom) = split(/:/,$linkprotuser,2); + $preamble .= '

'.&mt('As you followed a link from another system, while logged into that other system with the username: [_1], it is recommended that you contact your instructor.',''.$uname.'').'

'; + } else { + my $relogin; + my %data = ( + origurl => $r->uri, + linkprot => $linkprot, + linkprotexit => $linkprotexit, + linkprotpbid => $linkprotpbid, + linkprotpburl => $linkprotpburl, + ); + my $token = + &Apache::lonnet::tmpput(\%data,$r->dir_config('lonHostID'),'retry'); + unless (($token eq 'con_lost') || ($token eq 'refused') || ($token =~ /^error:/) || + ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) { + $relogin = '/adm/relaunch?rtoken='.$token; + } + $preamble .= '

'.&mt('You might try logging in with a different username and/or domain.').' '. + &mt('You are currently logged in as: [_1] in domain: [_2]', + ''.$env{'user.name'}.'',''.$env{'user.domain'}.'').'

'; + if ($relogin) { + $preamble .= '

'.&mt('[_1]Log-in again[_2]','','').'

'; + } + } + } + if ($env{'form.ttoken'}) { + &Apache::lonnet::tmpdel($env{'form.ttoken'}); + } + if ($ltoken) { + &Apache::lonnet::tmpdel($ltoken); + } } } &Apache::loncommon::content_type($r,'text/html');