version 1.51, 2021/08/07 20:49:10
|
version 1.56, 2021/11/18 20:25:27
|
Line 283 sub ip_changed {
|
Line 283 sub ip_changed {
|
my %info= ( |
my %info= ( |
'domain' => $udom, |
'domain' => $udom, |
'username' => $dataref->{'username'}, |
'username' => $dataref->{'username'}, |
'role' => $dataref->{'role'}, |
|
'sessionserver' => $lonhost, |
'sessionserver' => $lonhost, |
); |
); |
if ($dataref->{'origurl'}) { |
my @names = ('origurl','symb','role','linkprot','linkkey'); |
$info{'origurl'} = $dataref->{'origurl'}; |
foreach my $name (@names) { |
} |
if ($dataref->{$name} ne '') { |
if ($dataref->{'symb'}) { |
$info{$name} = $dataref->{$name}; |
$info{'symb'} = $dataref->{'symb'}; |
} |
} |
} |
my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto); |
my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto,'link'); |
unless ($iptoken eq 'conlost') { |
unless ($iptoken eq 'conlost') { |
$url .= ($url =~ /\?/) ? '&' : '?'; |
$url .= (($url =~ /\?/) ? '&' : '?') . 'iptoken='.$iptoken; |
$url .= 'iptoken='.$iptoken; |
|
} |
} |
$r->print(&Apache::loncommon::start_page($title,undef, |
$r->print(&Apache::loncommon::start_page($title,undef, |
{'redirect' => |
{'redirect' => |
Line 705 sub handler {
|
Line 703 sub handler {
|
} |
} |
} |
} |
} else { |
} 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) { |
if ($handle) { |
&Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'), |
&Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'), |
$handle); |
$handle); |
|
my $checklaunch; |
|
if ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) { |
|
if ($env{'request.linkprot'} ne '') { |
|
unless ($env{'request.linkprot'} eq $data{'linkprot'}) { |
|
$checklaunch = 1; |
|
} |
|
} |
|
if ($env{'request.linkkey'} ne '') { |
|
unless ($env{'request.linkkey'} eq $data{'linkkey'}) { |
|
$checklaunch = 1; |
|
} |
|
} |
|
if ($env{'request.deeplink.login'}) { |
|
unless ($env{'request.deeplink.login'} eq $data{'deeplink.login'}) { |
|
$checklaunch = 1; |
|
} |
|
} |
|
} |
if ($data{'linkprot'} ne '') { |
if ($data{'linkprot'} ne '') { |
|
&Apache::lonnet::appenv({'request.linkprot' => $data{'linkprot'}}); |
|
if ($env{'request.linkkey'}) { |
|
&Apache::lonnet::delenv('request.linkkey'); |
|
} |
my ($linkprotector,$deeplink) = split(/:/,$data{'linkprot'},2); |
my ($linkprotector,$deeplink) = split(/:/,$data{'linkprot'},2); |
if ($env{'user.linkprotector'}) { |
if ($env{'user.linkprotector'}) { |
my @protectors = split(/,/,$env{'user.linkprotector'}); |
my @protectors = split(/,/,$env{'user.linkprotector'}); |
Line 731 sub handler {
|
Line 764 sub handler {
|
} else { |
} else { |
&Apache::lonnet::appenv({'user.linkproturi' => $deeplink}); |
&Apache::lonnet::appenv({'user.linkproturi' => $deeplink}); |
} |
} |
} elsif ($data{'linkkey'}) { |
} 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'}; |
my $deeplink = $data{'deeplink.login'}; |
my $linkkey = $data{'linkkey'}; |
my $linkkey = $data{'linkkey'}; |
if ($env{'user.deeplinkkey'}) { |
if ($env{'user.deeplinkkey'} ne '') { |
my @linkkeys = split(/,/,$env{'user.deeplinkkey'}); |
my @linkkeys = split(/,/,$env{'user.deeplinkkey'}); |
unless (grep(/^\Q$linkkey\E$/,@linkkeys)) { |
unless (grep(/^\Q$linkkey\E$/,@linkkeys)) { |
push(@linkkeys,$linkkey); |
push(@linkkeys,$linkkey); |
Line 743 sub handler {
|
Line 780 sub handler {
|
} else { |
} else { |
&Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey}); |
&Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey}); |
} |
} |
if ($deeplink) { |
if ($deeplink) { |
if ($env{'user.keyedlinkuri'}) { |
if ($env{'user.keyedlinkuri'}) { |
my @keyeduris = split(/,/,$env{'user.keyedlinkuri'}); |
my @keyeduris = split(/,/,$env{'user.keyedlinkuri'}); |
unless (grep(/^\Q$deeplink\E$/,@keyeduris)) { |
unless (grep(/^\Q$deeplink\E$/,@keyeduris)) { |
Line 835 sub handler {
|
Line 872 sub handler {
|
} |
} |
} |
} |
} elsif ($data{'origurl'} ne '') { |
} 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'}; |
|
} elsif ($env{'request.linkkey'} ne '') { |
|
$info{'linkkey'} = $env{'request.linkkey'}; |
|
} |
|
$info{'origurl'} = $data{'origurl'}; |
|
if ($checklaunch) { |
|
$info{'checklaunch'} = 1; |
|
} |
|
my $token = &Apache::lonnet::tmpput(\%info,$r->dir_config('lonHostID'),'link'); |
|
unless (($token eq 'con_lost') || ($token eq 'refused') || |
|
($token eq 'unknown_cmd') || ($token eq 'no_such_host')) { |
|
$dest .= (($dest =~ /\?/) ? '&' : '?') . 'ttoken='.$token; |
|
} |
|
} |
|
$r->internal_redirect($dest); |
} elsif ($env{'request.course.id'}) { |
} elsif ($env{'request.course.id'}) { |
$r->internal_redirect('/adm/navmaps'); |
$r->internal_redirect('/adm/navmaps'); |
} else { |
} else { |
Line 843 sub handler {
|
Line 899 sub handler {
|
} |
} |
} else { |
} else { |
my $desturl = '/adm/roles'; |
my $desturl = '/adm/roles'; |
if ($data{'lti.login'}) { |
if ($data{'lti.login'}) { |
if ($data{'lti.selfenrollrole'}) { |
if ($data{'lti.selfenrollrole'}) { |
$desturl .= '?selectrole=1&'. |
$desturl .= '?selectrole=1&'. |
&escape($data{'lti.selfenrollrole'}).'=1'; |
&escape($data{'lti.selfenrollrole'}).'=1'; |
Line 867 sub handler {
|
Line 923 sub handler {
|
if (ref($extra_env) eq 'HASH') { |
if (ref($extra_env) eq 'HASH') { |
$extra_env->{'user.linkprotector'} = $linkprotector; |
$extra_env->{'user.linkprotector'} = $linkprotector; |
$extra_env->{'user.linkproturi'} = $linkuri; |
$extra_env->{'user.linkproturi'} = $linkuri; |
|
$extra_env->{'request.linkprot'} = $data{'linkprot'}; |
} else { |
} else { |
$extra_env = {'user.linkprotector' => $linkprotector, |
$extra_env = {'user.linkprotector' => $linkprotector, |
'user.linkproturi' => $linkuri,}; |
'user.linkproturi' => $linkuri, |
} |
'request.linkprot' => $data{'linkprot'}}; |
} |
|
} 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'}}; |
|
} |
} |
} |
} |
|
} elsif ($data{'linkkey'} ne '') { |
if (ref($extra_env) eq 'HASH') { |
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 { |
} else { |
$extra_env = {'request.deeplink.login' => $data{'deeplink.login'}}; |
$extra_env = {'request.deeplink.login' => $data{'deeplink.login'}}; |
} |
} |
Line 898 sub handler {
|
Line 958 sub handler {
|
} |
} |
} |
} |
&Apache::lonauth::success($r,$data{'username'},$data{'domain'}, |
&Apache::lonauth::success($r,$data{'username'},$data{'domain'}, |
$home,$desturl,$extra_env,\%form,$skipcritical); |
$home,$desturl,$extra_env,\%form,$skipcritical,'', |
|
$expirepub); |
} |
} |
return OK; |
return OK; |
} |
} |
Line 930 sub handler {
|
Line 991 sub handler {
|
($env{'request.role'} eq $data{'role'}) && ($data{'origurl'} ne '')) { |
($env{'request.role'} eq $data{'role'}) && ($data{'origurl'} ne '')) { |
$next_url = $data{'origurl'}; |
$next_url = $data{'origurl'}; |
$reuse_session = 1; |
$reuse_session = 1; |
|
} elsif ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) { |
|
$next_url=$data{'origurl'}; |
} else { |
} else { |
$next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; |
$next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; |
if ($data{'origurl'} ne '') { |
if ($data{'origurl'} ne '') { |
$next_url .= '&orgurl='.&escape($data{'origurl'}); |
$next_url .= '&orgurl='.&escape($data{'origurl'}); |
} |
} |
} |
} |
if ($data{'lti.login'}) { |
if ($data{'lti.login'}) { |
if (($data{'origurl'} =~ m{/default_\d+\.sequence$}) || |
if (($data{'origurl'} =~ m{/default_\d+\.sequence$}) || |
($data{'origurl'} =~ m{^/res/.+\.sequence$})) { |
($data{'origurl'} =~ m{^/res/.+\.sequence$})) { |
$next_url .= '&navmap=1'; |
$next_url .= '&navmap=1'; |
} |
} |
} |
} |
if ($reuse_session) { |
if ($reuse_session) { |
$r->internal_redirect($next_url); |
$r->internal_redirect($next_url); |
} else { |
} elsif ($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'}; |
|
} elsif ($data{'linkkey'} ne '') { |
|
$extra_env->{'request.linkkey'} = $data{'linkkey'}; |
|
} |
&Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home, |
&Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home, |
$next_url,$extra_env,\%form,'',$cid); |
$next_url,$extra_env,\%form,'',$cid); |
} |
} |