--- loncom/interface/lontiny.pm 2019/02/07 14:56:05 1.6.2.1 +++ loncom/interface/lontiny.pm 2022/07/02 17:17:47 1.13 @@ -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.6.2.1 2019/02/07 14:56:05 raeburn Exp $ +# $Id: lontiny.pm,v 1.13 2022/07/02 17:17:47 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -67,7 +67,31 @@ sub handler { if ($cnum =~ /^$match_courseid$/) { 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); + 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'}; + } 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 ($env{'request.course.id'} eq $cdom.'_'.$cnum) { + # Check for ttoken + my $newlauncher = &launch_check($r->uri,$symb); my ($map,$resid,$url) = &Apache::lonnet::decode_symb($symb); if (&Apache::lonnet::is_on_map($url)) { my $realuri; @@ -96,24 +120,28 @@ sub handler { } my $update; # Check if course needs to be re-initialized - my $loncaparev = $r->dir_config('lonVersion'); - my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev); - if ($result eq 'update') { - $update = 1; - } elsif (!-e $env{'request.course.fn'}.'.db') { + if ($newlauncher) { $update = 1; - } elsif (!$env{'request.role.adv'}) { - my $navmap = Apache::lonnavmaps::navmap->new(); - if (ref($navmap)) { - my $res = $navmap->getBySymb($symb); - if (ref($res)) { - my ($enc_in_bighash,$enc_in_parm); - $enc_in_bighash = $res->encrypted(); - if (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i) { - $enc_in_parm = 1; - } - if ($enc_in_bighash ne $enc_in_parm) { - $update = 1; + } else { + my $loncaparev = $r->dir_config('lonVersion'); + my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev); + if ($result eq 'update') { + $update = 1; + } elsif (!-e $env{'request.course.fn'}.'.db') { + $update = 1; + } elsif (!$env{'request.role.adv'}) { + my $navmap = Apache::lonnavmaps::navmap->new(); + if (ref($navmap)) { + my $res = $navmap->getBySymb($symb); + if (ref($res)) { + my ($enc_in_bighash,$enc_in_parm); + $enc_in_bighash = $res->encrypted(); + if (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i) { + $enc_in_parm = 1; + } + if ($enc_in_bighash ne $enc_in_parm) { + $update = 1; + } } } } @@ -149,33 +177,79 @@ 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(%active); + if ($env{'request.lti.login'}) { + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); + if ($env{'request.lti.target'} eq '') { + if ($env{'form.ltitarget'} eq 'iframe') { + &Apache::lonnet::appenv({'request.lti.target' => 'iframe'}); + delete($env{'form.ltitarget'}); + } + } + if ($env{'form.selectrole'}) { + foreach my $role (@allposs) { + my $newrole = "$role./$cdom/$cnum"; + if ($possroles{$allposs[0]} ne '') { + $newrole .= "/$possroles{$role}"; + } + if ($env{"form.$newrole"}) { + my $destination .= '/adm/roles?selectrole=1&'.$newrole.'=1'. + '&destinationurl='.&HTML::Entities::encode($r->uri,'&<>"'); + if ($env{'form.ltitarget'} eq 'iframe') { + $destination .= '<itarget=iframe'; + } + &do_redirect($r,$destination); + return OK; + } } } } - my @allposs = keys(%possroles); if (@allposs == 0) { - &show_roles($r,\%crsenv,\%possroles); + &show_roles($r,\%crsenv,\%active,'','',\%future,\%expired,$linkprot,$linkprotuser,$linkprotexit,$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); - &do_redirect($r,$destination); + '&destinationurl='.&HTML::Entities::encode($r->uri,'&<>"'); + if ($env{'form.ttoken'}) { + $destination .= '&ttoken='.$env{'form.ttoken'}; + } + &do_redirect($r,$destination,$linkprot); } elsif (keys(%possroles) > 1) { if (grep(/^(cc|co)$/,@allposs)) { my $newrole; @@ -186,8 +260,11 @@ sub handler { } $newrole .= "./$cdom/$cnum"; my $destination .= '/adm/roles?selectrole=1&'.$newrole.'=1'. - '&destinationurl='.&HTML::Entities::encode($r->uri); - &do_redirect($r,$destination); + '&destinationurl='.&HTML::Entities::encode($r->uri,'&<>"'); + if ($env{'form.ttoken'}) { + $destination .= '&ttoken='.$env{'form.ttoken'}; + } + &do_redirect($r,$destination,$linkprot); } else { my $hascustom; if (grep(/^cr\//,@allposs)) { @@ -210,26 +287,186 @@ sub handler { } } +sub launch_check { + my ($linkuri,$symb) = @_; + my ($linkprotector,$linkproturi,$linkkey,$newlauncher); + if ($env{'form.ttoken'}) { + my %link_info = &Apache::lonnet::tmpget($env{'form.ttoken'}); + &Apache::lonnet::tmpdel($env{'form.ttoken'}); + delete($env{'form.ttoken'}); + if ($link_info{'ltoken'}) { + unless (($link_info{'linkprot'}) || ($link_info{'linkkey'} ne '')) { + my %ltoken_info = &Apache::lonnet::tmpget($link_info{'ltoken'}); + if ($ltoken_info{'linkprot'}) { + $link_info{'linkprot'} = $ltoken_info{'linkprot'}; + } elsif ($ltoken_info{'linkkey'} ne '') { + $link_info{'linkkey'} = $ltoken_info{'linkkey'}; + } + } + &Apache::lonnet::tmpdel($link_info{'ltoken'}); + } + if ($link_info{'linkprot'}) { + ($linkprotector,$linkproturi) = split(/:/,$link_info{'linkprot'},2); + if ($env{'user.linkprotector'}) { + my @protectors = split(/,/,$env{'user.linkprotector'}); + unless (grep(/^\Q$linkprotector\E$/,@protectors)) { + push(@protectors,$linkprotector); + @protectors = sort { $a <=> $b } @protectors; + &Apache::lonnet::appenv({'user.linkprotector' => join(',',@protectors)}); + } + } else { + &Apache::lonnet::appenv({'user.linkprotector' => $linkprotector }); + } + if ($env{'user.linkproturi'}) { + my @proturis = split(/,/,$env{'user.linkproturi'}); + unless(grep(/^\Q$linkproturi\E$/,@proturis)) { + push(@proturis,$linkproturi); + @proturis = sort(@proturis); + &Apache::lonnet::appenv({'user.linkproturi' => join(',',@proturis)}); + } + } else { + &Apache::lonnet::appenv({'user.linkproturi' => $linkproturi}); + } + } elsif ($link_info{'linkkey'} ne '') { + $linkkey = $link_info{'linkkey'}; + my $keyedlinkuri = $linkuri; + if ($env{'user.deeplinkkey'} ne '') { + my @linkkeys = split(/,/,$env{'user.deeplinkkey'}); + unless (grep(/^\Q$linkkey\E$/,@linkkeys)) { + push(@linkkeys,$linkkey); + &Apache::lonnet::appenv({'user.deeplinkkey' => join(',',sort(@linkkeys))}); + } + } else { + &Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey}); + } + if ($env{'user.keyedlinkuri'}) { + my @keyeduris = split(/,/,$env{'user.keyedlinkuri'}); + unless (grep(/^\Q$keyedlinkuri\E$/,@keyeduris)) { + push(@keyeduris,$keyedlinkuri); + &Apache::lonnet::appenv({'user.keyedlinkuri' => join(',',sort(@keyeduris))}); + } + } else { + &Apache::lonnet::appenv({'user.keyedlinkuri' => $keyedlinkuri}); + } + } + if ($link_info{'checklaunch'}) { + $newlauncher = 1; + } + } + my $currdeeplinklogin = $env{'request.deeplink.login'}; + my $deeplink; + if ($symb =~ /\.(page|sequence)$/) { + my $mapname = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($symb))[2]); + my $navmap = Apache::lonnavmaps::navmap->new(); + if (ref($navmap)) { + $deeplink = $navmap->get_mapparam(undef,$mapname,'0.deeplink'); + } + } else { + $deeplink = &Apache::lonnet::EXT('resource.0.deeplink',$symb); + } + if ($deeplink ne '') { + my $disallow; + my ($state,$others,$listed,$scope,$protect,$display,$target) = split(/,/,$deeplink); + if (($protect ne 'none') && ($protect ne '')) { + my ($acctype,$item) = split(/:/,$protect); + if ($acctype =~ /lti(c|d)$/) { + my $ltitype = $1; + if ($linkprotector) { + unless ($linkprotector.':'.$linkproturi eq $item.$ltitype.':'.$linkuri) { + $disallow = 1; + } + } else { + $disallow = 1; + } + } elsif ($acctype eq 'key') { + if ($linkkey ne '') { + unless ($linkkey eq $item) { + $disallow = 1; + } + } else { + $disallow = 1; + } + } + } + if ($disallow) { + if ($currdeeplinklogin eq $linkuri) { + &Apache::lonnet::delenv('request.deeplink.login'); + if ($env{'request.deeplink.target'} ne '') { + &Apache::lonnet::delenv('request.deeplink.target'); + } + } + } 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; + } + } + &Apache::lonnet::appenv({'request.deeplink.login' => $linkuri}); + if ($target ne '') { + &Apache::lonnet::appenv({'request.deeplink.target' => $target}); + } elsif ($env{'request.deeplink.target'} ne '') { + &Apache::lonnet::delenv('request.deeplink.target'); + } + } + } else { + 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}); + } else { + &Apache::lonnet::delenv('request.linkkey'); + } + &Apache::lonnet::appenv({'request.deeplink.login' => $linkuri}); + if ($env{'request.deeplink.target'} ne '') { + &Apache::lonnet::delenv('request.deeplink.target'); + } + } + return $newlauncher; +} + 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,$ltoken) = @_; my ($crsdesc,$crstype,$cdom,$cnum,$header,$title,$preamble,$datatable,$js,$args); if (ref($crsenv) eq 'HASH') { $crsdesc = $crsenv->{'description'}; @@ -248,6 +485,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:'); @@ -255,12 +495,15 @@ sub show_roles { $preamble = &mt('You have the following active roles in this course:'); } $datatable = '
'. - ''. - ''. - ''. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(). - ''.&mt('User role').''; + ''."\n". + ''."\n". + ''."\n"; + if ($env{'form.ttoken'}) { + $datatable .= ''."\n"; + } + $datatable .= &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + ''.&mt('User role').''; if ($hassection) { $datatable .= ''.&mt('Section').''; } @@ -336,9 +579,55 @@ 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, + ); + 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'); @@ -354,13 +643,15 @@ ENDJS sub generic_error { my ($r) = @_; my $continuelink; - my $linktext; - if ($env{'user.adv'}) { - $linktext = &mt('Continue to your roles page'); - } else { - $linktext = &mt('Continue to your courses page'); + unless ($env{'request.lti.login'}) { + my $linktext; + if ($env{'user.adv'}) { + $linktext = &mt('Continue to your roles page'); + } else { + $linktext = &mt('Continue to your courses page'); + } + $continuelink=''.$linktext.''; } - $continuelink=''.$linktext.''; my $msg = &mt('The page you requested does not exist.'); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header;