version 1.40, 2018/12/07 23:16:50
|
version 1.45, 2019/06/16 22:27:06
|
Line 71 sub sso_check {
|
Line 71 sub sso_check {
|
$extra_env{'request.sso.reloginserver'} = |
$extra_env{'request.sso.reloginserver'} = |
$data->{'sso.reloginserver'}; |
$data->{'sso.reloginserver'}; |
} |
} |
if (($data->{'balancer'}) && ($data->{'server'}) && ($data->{'balcookie'})) { |
|
$extra_env{'request.balancercookie'} = $data->{'server'}.':'.$data->{'balcookie'}; |
|
} |
|
} |
} |
return \%extra_env; |
return \%extra_env; |
} |
} |
Line 340 sub logout {
|
Line 337 sub logout {
|
} |
} |
my (%info,%user_info,%lti_info); |
my (%info,%user_info,%lti_info); |
if (ref($lti_env) eq 'HASH') { |
if (ref($lti_env) eq 'HASH') { |
%lti_info = %{$lti_env}; |
foreach my $key (sort(keys(%{$lti_env}))) { |
|
if ($key =~ /^request\.(.+)$/) { |
|
$lti_info{$1} = $lti_env->{$key}; |
|
} |
|
} |
} |
} |
my $lonhost = $r->dir_config('lonHostID'); |
my $lonhost = $r->dir_config('lonHostID'); |
if (ref($data) eq 'HASH') { |
if (ref($data) eq 'HASH') { |
Line 362 sub logout {
|
Line 363 sub logout {
|
{'redirect' => [0.1,$url], |
{'redirect' => [0.1,$url], |
'only_body' => 1,}). |
'only_body' => 1,}). |
&Apache::loncommon::end_page()); |
&Apache::loncommon::end_page()); |
|
if ($env{'request.balancercookie'}) { |
|
my ($balancer,$cookie) = split(/:/,$env{'request.balancercookie'}); |
|
if ((&Apache::lonnet::hostname($balancer)) && ($cookie =~ /^[a-f0-9]{32}$/)) { |
|
$cookie = $env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cookie; |
|
&Apache::lonnet::delbalcookie($cookie,$balancer); |
|
} |
|
} |
$r->register_cleanup(\&flush_course_logs); |
$r->register_cleanup(\&flush_course_logs); |
return; |
return; |
} |
} |
Line 626 sub handler {
|
Line 634 sub handler {
|
return &goto_login($r,$udom,\%data); |
return &goto_login($r,$udom,\%data); |
} |
} |
} |
} |
|
|
my $rolemsg; |
my $rolemsg; |
if ($data{'role'}) { |
if ($data{'role'}) { |
$rolemsg = "role: $data{'role'}"; |
$rolemsg = "role: $data{'role'}"; |
Line 645 sub handler {
|
Line 653 sub handler {
|
} elsif ((ref($lti_env) eq 'HASH') && (keys(%{$lti_env}))) { |
} elsif ((ref($lti_env) eq 'HASH') && (keys(%{$lti_env}))) { |
$extra_env = $lti_env; |
$extra_env = $lti_env; |
} |
} |
|
if (($data{'balancer'}) && ($data{'server'}) && ($data{'balcookie'})) { |
|
if (ref($extra_env) eq 'HASH') { |
|
$extra_env->{'request.balancercookie'} = $data{'server'}.':'.$data{'balcookie'}; |
|
} else { |
|
$extra_env = { 'request.balancercookie' => $data{'server'}.':'.$data{'balcookie'} }; |
|
} |
|
} |
|
|
if (($data{'conlost'}) && ($data{'server'})) { |
if (($data{'conlost'}) && ($data{'server'})) { |
my @conlosts = split(/,/,$data{'conlost'}); |
my @conlosts = split(/,/,$data{'conlost'}); |
Line 672 sub handler {
|
Line 687 sub handler {
|
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); |
|
if ($data{'linkprot'} ne '') { |
|
my ($linkprotector,$deeplink) = split(/:/,$data{'linkprot'},2); |
|
if ($deeplink ne '') { |
|
&Apache::lonnet::appenv({'request.deeplink.login' => $deeplink}); |
|
} |
|
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$deeplink\E$/,@proturis)) { |
|
push(@proturis,$deeplink); |
|
@proturis = sort @proturis; |
|
&Apache::lonnet::appenv({'user.linkproturi' => join(',',@proturis)}); |
|
} |
|
} else { |
|
&Apache::lonnet::appenv({'user.linkproturi' => $deeplink}); |
|
} |
|
} elsif ($data{'deeplink.login'}) { |
|
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}); |
|
} |
|
if ($env{'user.keyedlinkuri'}) { |
|
my @keyeduris = split(/,/,$env{'user.keyedlinkuri'}); |
|
unless (grep(/^\Q$deeplink\E$/,@keyeduris)) { |
|
push(@keyeduris,$deeplink); |
|
&Apache::lonnet::appenv({'user.keyedlinkuri' => join(',',sort(@keyeduris))}); |
|
} |
|
} else { |
|
&Apache::lonnet::appenv({'user.keyedlinkuri' => $deeplink}); |
|
} |
|
} |
|
&Apache::lonnet::appenv({'request.deeplink.login' => $data{'deeplink.login'}}); |
|
} |
if ($data{'lti.login'}) { |
if ($data{'lti.login'}) { |
my $needslogout; |
my $needslogout; |
if ($env{'request.lti.login'}) { |
if ($env{'request.lti.login'}) { |
Line 765 sub handler {
|
Line 830 sub handler {
|
$desturl .= (($desturl =~/\?/)?'&':'?').'navmap=1'; |
$desturl .= (($desturl =~/\?/)?'&':'?').'navmap=1'; |
} |
} |
} |
} |
|
if ($data{'linkprot'}) { |
|
my ($linkprotector,$linkuri) = split(/:/,$data{'linkprot'},2); |
|
if ($linkprotector) { |
|
if (ref($extra_env) eq 'HASH') { |
|
$extra_env->{'user.linkprotector'} = $linkprotector; |
|
$extra_env->{'user.linkproturi'} = $linkuri; |
|
} else { |
|
$extra_env = {'user.linkprotector' => $linkprotector, |
|
'user.linkproturi' => $linkuri,}; |
|
} |
|
} |
|
} 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'}}; |
|
} |
|
} |
|
if (ref($extra_env) eq 'HASH') { |
|
$extra_env->{'request.deeplink.login' => $data{'deeplink.login'}}; |
|
} else { |
|
$extra_env = {'request.deeplink.login' => $data{'deeplink.login'}}; |
|
} |
|
} |
} |
} |
my $skipcritical; |
my $skipcritical; |
if (($data{'lti.login'}) && ($data{'lti.reqcrs'}) && |
if ($data{'lti.login'}) { |
($data{'lti.reqrole'} eq 'cc')) { |
if ((($data{'lti.reqcrs'}) && |
$skipcritical = 1; |
($data{'lti.reqrole'} eq 'cc')) || |
|
($data{'lti.selfenrollrole'})) { |
|
$skipcritical = 1; |
|
} |
} |
} |
&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); |
Line 777 sub handler {
|
Line 872 sub handler {
|
return OK; |
return OK; |
} |
} |
|
|
my $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; |
if ($data{'lti.login'}) { |
if ($data{'origurl'} ne '') { |
my $handle = &Apache::lonnet::check_for_valid_session($r); |
$next_url .= '&orgurl='.&escape($data{'origurl'}); |
if ($handle) { |
if ($data{'lti.login'}) { |
&Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'), |
if (($data{'origurl'} =~ m{/default_\d+\.sequence$}) || |
$handle); |
($data{'origurl'} =~ m{^/res/.+\.sequence$})) { |
my $needslogout; |
$next_url .= '&navmap=1'; |
if ($env{'request.lti.login'}) { |
|
if (($env{'user.name'} ne $data{'username'}) || |
|
($env{'user.domain'} ne $data{'domain'})) { |
|
$needslogout = 1; |
|
} |
|
} else { |
|
$needslogout = 1; |
|
} |
|
if ($needslogout) { |
|
&logout($r,$handle,\%data,$lti_env); |
|
return OK; |
} |
} |
} |
} |
} |
} |
&Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home, |
|
$next_url,$extra_env,\%form); |
# check if current user, and role match those expected. |
|
my ($next_url,$reuse_session); |
|
if (($env{'user.name'} eq $data{'username'}) && ($env{'user.domain'} eq $data{'domain'}) && |
|
($env{'request.role'} eq $data{'role'}) && ($data{'origurl'} ne '')) { |
|
$next_url = $data{'origurl'}; |
|
$reuse_session = 1; |
|
} 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) { |
|
$r->internal_redirect($next_url); |
|
} else { |
|
&Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home, |
|
$next_url,$extra_env,\%form); |
|
} |
return OK; |
return OK; |
} |
} |
|
|