'.&mt('Transferring to login page.').'
'. &Apache::loncommon::end_page()); @@ -283,23 +287,29 @@ sub ip_changed { my %info= ( 'domain' => $udom, 'username' => $dataref->{'username'}, - 'role' => $dataref->{'role'}, 'sessionserver' => $lonhost, ); - if ($dataref->{'origurl'}) { - $info{'origurl'} = $dataref->{'origurl'}; + my @names = ('origurl','symb','role','linkprotuser','linkprotexit','linkprot','linkkey','linkprotpbid','linkprotpburl'); + foreach my $name (@names) { + if ($dataref->{$name} ne '') { + $info{$name} = $dataref->{$name}; + } } - if ($dataref->{'symb'}) { - $info{'symb'} = $dataref->{'symb'}; + if ($info{'origurl'} eq '/adm/email') { + if (($dataref->{'display'}) && ($dataref->{'mailrecip'})) { + if (&unescape($dataref->{'mailrecip'}) eq $dataref->{'username'}.':'.$dataref->{'domain'}) { + $info{'display'} = $dataref->{'display'}; + $info{'mailrecip'} = $dataref->{'mailrecip'}; + } + } } - my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto); + my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto,'link'); unless ($iptoken eq 'conlost') { - $url .= ($url =~ /\?/) ? '&' : '?'; - $url .= 'iptoken='.$iptoken; + $url .= (($url =~ /\?/) ? '&' : '?') . 'iptoken='.$iptoken; } $r->print(&Apache::loncommon::start_page($title,undef, {'redirect' => - [2,$url],}). + [2,$url,'',$dataref->{'lcssowin'}],}). ''.$message.'
'. &Apache::loncommon::end_page()); @@ -310,7 +320,7 @@ sub ip_changed { } sub logout { - my ($r,$ip,$handle,$data,$lti_env) = @_; + my ($r,$ip,$handle,$data,$lti_env,$linkprot_info) = @_; my $lonidsdir=$r->dir_config('lonIDsDir'); if (unlink("$lonidsdir/$handle.id")) { if (($env{'user.linkedenv'} =~ /^[a-f0-9]+_linked$/) && @@ -337,15 +347,8 @@ sub logout { -expires => '-10y',); $r->headers_out->add('Set-cookie' => $c); } - my (%info,%user_info,%lti_info); - if (ref($lti_env) eq 'HASH') { - foreach my $key (sort(keys(%{$lti_env}))) { - if ($key =~ /^request\.(.+)$/) { - $lti_info{$1} = $lti_env->{$key}; - } - } - } my $lonhost = $r->dir_config('lonHostID'); + my ($url,$token,$delay,$write_to_opener,%info,%user_info); if (ref($data) eq 'HASH') { %user_info=('ip' => $ip, 'domain' => $data->{'domain'}, @@ -355,14 +358,41 @@ sub logout { 'origurl' => $data->{'origurl'}, 'symb' => $data->{'symb'}, 'server' => $lonhost); + $write_to_opener = $data->{'lcssowin'}; + } + $delay = 0.1; + if (ref($linkprot_info) eq 'HASH') { + if ($linkprot_info->{'linkprotuser'} ne '') { + $token = &Apache::lonnet::tmpput($linkprot_info,$lonhost); + $url = '/adm/login?ltoken='.$token; + } else { + foreach my $key (keys(%user_info)) { + if ($user_info{$key} eq '') { + delete($user_info{$key}); + } + } + %info = (%user_info,%{$linkprot_info}); + $token = &Apache::lonnet::tmpput(\%info,$lonhost); + $url = '/adm/migrateuser?token='.$token; + } + $delay = 0; + } else { + my %lti_info; + if (ref($lti_env) eq 'HASH') { + foreach my $key (sort(keys(%{$lti_env}))) { + if ($key =~ /^request\.(.+)$/) { + $lti_info{$1} = $lti_env->{$key}; + } + } + } + %info = (%user_info,%lti_info); + $token = &Apache::lonnet::tmpput(\%info,$lonhost); + $url = '/adm/migrateuser?token='.$token; } - %info = (%user_info,%lti_info); - my $token = &Apache::lonnet::tmpput(\%info,$lonhost); - my $url = '/adm/migrateuser?token='.$token; $r->send_http_header; $r->print( &Apache::loncommon::start_page('Updating Session ...',undef, - {'redirect' => [0.1,$url], + {'redirect' => [$delay,$url,'',$write_to_opener], 'only_body' => 1,}). &Apache::loncommon::end_page()); if ($env{'request.balancercookie'}) { @@ -705,15 +735,64 @@ sub handler { } } } else { - my $handle = &Apache::lonnet::check_for_valid_session($r); + my ($handle,$expirepub); + $handle = &Apache::lonnet::check_for_valid_session($r); + +# For "public user" - remove any existing "public" cookie so actual user is logged in. + if ($handle) { + if ($handle=~/^publicuser\_/) { + my $lonidsdir=$r->dir_config('lonIDsDir'); + if ($lonidsdir ne '') { + unlink("$lonidsdir/$handle.id"); + } + undef($handle); + $expirepub = 1; + } + } if ($handle) { &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'), $handle); + my ($checklaunch,$prevlaunch); + if ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) { + unless ($env{'request.linkprot'} eq $data{'linkprot'}) { + $checklaunch = 1; + } + unless ($env{'request.linkprotexit'} eq $data{'linkprotexit'}) { + $checklaunch = 1; + } + unless ($env{'request.linkprotpbid'} eq $data{'linkprotpbid'}) { + $checklaunch = 1; + } + unless ($env{'request.linkprotpburl'} eq $data{'linkprotpburl'}) { + $checklaunch = 1; + } + unless ($env{'request.linkkey'} eq $data{'linkkey'}) { + $checklaunch = 1; + } + unless ($env{'request.deeplink.login'} eq $data{'deeplink.login'}) { + $checklaunch = 1; + } + } if ($data{'linkprot'} ne '') { - my ($linkprotector,$deeplink) = split(/:/,$data{'linkprot'},2); - if ($deeplink ne '') { - &Apache::lonnet::appenv({'request.deeplink.login' => $deeplink}); + if (($env{'user.name'} ne $data{'username'}) || + ($env{'user.domain'} ne $data{'domain'})) { + my %linkprot_env; + foreach my $item ('linkprot','linkprotexit','linkprotpbid','linkprotpburl','deeplink.login') { + if ($data{$item}) { + $linkprot_env{$item} = $data{$item}; + } + } + &logout($r,$ip,$handle,\%data,undef,\%linkprot_env); + return OK; } + &Apache::lonnet::appenv({'request.linkprot' => $data{'linkprot'}}); + if ($data{'linkprotexit'}) { + &Apache::lonnet::appenv({'request.linkprotexit' => $data{'linkprotexit'}}); + } + if ($env{'request.linkkey'}) { + &Apache::lonnet::delenv('request.linkkey'); + } + my ($linkprotector,$deeplink) = split(/:/,$data{'linkprot'},2); if ($env{'user.linkprotector'}) { my @protectors = split(/,/,$env{'user.linkprotector'}); unless (grep(/^\Q$linkprotector\E$/,@protectors)) { @@ -734,19 +813,23 @@ sub handler { } else { &Apache::lonnet::appenv({'user.linkproturi' => $deeplink}); } - } elsif ($data{'deeplink.login'}) { + } elsif ($data{'linkkey'} ne '') { + &Apache::lonnet::appenv({'request.linkkey' => $data{'linkkey'}}); + if ($env{'request.linkprot'}) { + &Apache::lonnet::delenv('request.linkprot'); + } my $deeplink = $data{'deeplink.login'}; - if ($data{'linkkey'}) { - my $linkkey = $data{'linkkey'}; - if ($env{'user.deeplinkkey'}) { - 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}); + my $linkkey = $data{'linkkey'}; + 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 ($deeplink) { if ($env{'user.keyedlinkuri'}) { my @keyeduris = split(/,/,$env{'user.keyedlinkuri'}); unless (grep(/^\Q$deeplink\E$/,@keyeduris)) { @@ -757,7 +840,11 @@ sub handler { &Apache::lonnet::appenv({'user.keyedlinkuri' => $deeplink}); } } + } + if ($data{'deeplink.login'}) { &Apache::lonnet::appenv({'request.deeplink.login' => $data{'deeplink.login'}}); + } elsif ($env{'request.deeplink.login'}) { + $prevlaunch = $env{'request.deeplink.login'}; } if ($data{'lti.login'}) { my $needslogout; @@ -836,7 +923,34 @@ sub handler { } } } elsif ($data{'origurl'} ne '') { - $r->internal_redirect($data{'origurl'}); + my $dest = $data{'origurl'}; + if (($env{'request.deeplink.login'} eq $data{'origurl'}) && + (($env{'request.linkprot'}) || ($env{'request.linkkey'} ne ''))) { + my %info; + if ($env{'request.linkprot'}) { + $info{'linkprot'} = $env{'request.linkprot'}; + foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') { + if ($data{$item}) { + $info{$item} = $data{$item}; + } + } + } elsif ($env{'request.linkkey'} ne '') { + $info{'linkkey'} = $env{'request.linkkey'}; + } + $info{'origurl'} = $data{'origurl'}; + if ($checklaunch) { + $info{'checklaunch'} = 1; + } + if ($prevlaunch) { + $info{'prevlaunch'} = $prevlaunch; + } + my $token = &Apache::lonnet::tmpput(\%info,$r->dir_config('lonHostID'),'link'); + unless (($token eq 'con_lost') || ($token eq 'refused') || ($token =~ /^error:/) || + ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) { + $dest .= (($dest =~ /\?/) ? '&' : '?') . 'ttoken='.$token; + } + } + $r->internal_redirect($dest); } elsif ($env{'request.course.id'}) { $r->internal_redirect('/adm/navmaps'); } else { @@ -844,7 +958,7 @@ sub handler { } } else { my $desturl = '/adm/roles'; - if ($data{'lti.login'}) { + if ($data{'lti.login'}) { if ($data{'lti.selfenrollrole'}) { $desturl .= '?selectrole=1&'. &escape($data{'lti.selfenrollrole'}).'=1'; @@ -868,27 +982,52 @@ sub handler { if (ref($extra_env) eq 'HASH') { $extra_env->{'user.linkprotector'} = $linkprotector; $extra_env->{'user.linkproturi'} = $linkuri; + $extra_env->{'request.linkprot'} = $data{'linkprot'}; } else { $extra_env = {'user.linkprotector' => $linkprotector, - 'user.linkproturi' => $linkuri,}; + 'user.linkproturi' => $linkuri, + 'request.linkprot' => $data{'linkprot'}}; + } + if ($data{'linkprotexit'}) { + $extra_env->{'request.linkprotexit'} = $data{'linkprotexit'}; + } + if ($data{'linkprotpbid'}) { + $extra_env->{'request.linkprotpbid'} = $data{'linkprotpbid'}; + } + if ($data{'linkprotpburl'}) { + $extra_env->{'request.linkprotpburl'} = $data{'linkprotpburl'}; } } - } elsif ($data{'deeplink.login'}) { - if ($data{'linkkey'}) { - if (ref($extra_env) eq 'HASH') { - $extra_env->{'user.deeplinkkey'} = $data{'linkkey'}; - $extra_env->{'user.keyedlinkuri'} = $data{'deeplink.login'}, - } else { - $extra_env = {'user.deeplinkkey' => $data{'linkkey'}, - 'user.keyedlinkuri' => $data{'deeplink.login'}}; + foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') { + if ($data{$item} ne '') { + $form{$item} = $data{$item}; } } + } elsif ($data{'linkkey'} ne '') { if (ref($extra_env) eq 'HASH') { - $extra_env->{'request.deeplink.login' => $data{'deeplink.login'}}; + $extra_env->{'user.deeplinkkey'} = $data{'linkkey'}; + $extra_env->{'user.keyedlinkuri'} = $data{'deeplink.login'}; + $extra_env->{'request.linkkey'} = $data{'linkkey'}; + } else { + $extra_env = {'user.deeplinkkey' => $data{'linkkey'}, + 'user.keyedlinkuri' => $data{'deeplink.login'}, + 'request.linkkey' => $data{'linkkey'}}; + } + } + if ($data{'deeplink.login'}) { + if (ref($extra_env) eq 'HASH') { + $extra_env->{'request.deeplink.login'} = $data{'deeplink.login'}; } else { $extra_env = {'request.deeplink.login' => $data{'deeplink.login'}}; } } + if ($desturl eq '/adm/email') { + if (($data{'display'}) && ($data{'mailrecip'})) { + if (&unescape($data{'mailrecip'}) eq "$data{'username'}:$data{'domain'}") { + $form{'display'} = &unescape($data{'display'}); + } + } + } } my $skipcritical; if ($data{'lti.login'}) { @@ -899,7 +1038,8 @@ sub handler { } } &Apache::lonauth::success($r,$data{'username'},$data{'domain'}, - $home,$desturl,$extra_env,\%form,$skipcritical); + $home,$desturl,$extra_env,\%form,$skipcritical,'', + $expirepub,$data{'lcssowin'}); } return OK; } @@ -931,23 +1071,62 @@ sub handler { ($env{'request.role'} eq $data{'role'}) && ($data{'origurl'} ne '')) { $next_url = $data{'origurl'}; $reuse_session = 1; + } elsif ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) { + $next_url=$data{'origurl'}; } else { - $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; - if ($data{'origurl'} ne '') { - $next_url .= '&orgurl='.&escape($data{'origurl'}); + if ($data{'lti.login'}) { + $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; + if ($data{'origurl'} ne '') { + $next_url .= '&orgurl='.&escape($data{'origurl'}); + } + } else { + $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; + if ($data{'origurl'} ne '') { + $next_url .= '&orgurl='.&escape($data{'origurl'}); + } } } if ($data{'lti.login'}) { if (($data{'origurl'} =~ m{/default_\d+\.sequence$}) || ($data{'origurl'} =~ m{^/res/.+\.sequence$})) { - $next_url .= '&navmap=1'; + if ($reuse_session) { + $next_url .= '&navmap=1'; + } else { + $next_url .= '&navmap=1'; + } } } if ($reuse_session) { $r->internal_redirect($next_url); } else { + if ($data{'deeplink.login'}) { + if (ref($extra_env) eq 'HASH') { + $extra_env->{'request.deeplink.login'} = $data{'deeplink.login'}; + } else { + $extra_env = {'request.deeplink.login' => $data{'deeplink.login'}}; + } + if ($data{'linkprot'}) { + $extra_env->{'request.linkprot'} = $data{'linkprot'}; + if ($data{'linkprotexit'}) { + $extra_env->{'request.linkprotexit'} = $data{'linkprotexit'}; + } + if ($data{'linkprotpbid'}) { + $extra_env->{'request.linkprotpassbid'} = $data{'linkprotpbid'}; + } + if ($data{'linkprotpburl'}) { + $extra_env->{'request.linkprotpassburl'} = $data{'linkprotpburl'}; + } + foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') { + if ($data{$item}) { + $form{'request.'.$item} = $data{$item}; + } + } + } elsif ($data{'linkkey'} ne '') { + $extra_env->{'request.linkkey'} = $data{'linkkey'}; + } + } &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home, - $next_url,$extra_env,\%form,'',$cid); + $next_url,$extra_env,\%form,'',$cid,'',$data{'lcssowin'}); } return OK; }