version 1.159.2.21.2.4, 2023/01/23 00:32:03
|
version 1.159.2.21.2.5, 2023/07/05 17:31:46
|
Line 306 sub sso_login {
|
Line 306 sub sso_login {
|
my $query = $r->args; |
my $query = $r->args; |
my %form; |
my %form; |
if ($query) { |
if ($query) { |
|
|
my @items = ('role','symb','iptoken','origurl','ttoken', |
my @items = ('role','symb','iptoken','origurl','ttoken', |
'ltoken','linkkey','logtoken','sso','lcssowin'); |
'ltoken','linkkey','logtoken','sso','lcssowin'); |
&Apache::loncommon::get_unprocessed_cgi($query,\@items); |
&Apache::loncommon::get_unprocessed_cgi($query,\@items); |
Line 326 sub sso_login {
|
Line 325 sub sso_login {
|
} |
} |
} |
} |
|
|
my ($linkprot,$linkprotuser,$linkprotexit,$linkkey,$deeplinkurl); |
my ($linkprot,$linkprotuser,$linkprotexit,$linkkey,$deeplinkurl, |
|
$linkprotpbid,$linkprotpburl); |
|
|
# |
# |
# If Shibboleth auth is in use, and a dual SSO and non-SSO login page |
# If Shibboleth auth is in use, and a dual SSO and non-SSO login page |
Line 366 sub sso_login {
|
Line 366 sub sso_login {
|
$linkprot = $info{'linkprot'}; |
$linkprot = $info{'linkprot'}; |
$linkprotuser = $info{'linkprotuser'}; |
$linkprotuser = $info{'linkprotuser'}; |
$linkprotexit = $info{'linkprotexit'}; |
$linkprotexit = $info{'linkprotexit'}; |
|
$linkprotpbid = $info{'linkprotpbid'}; |
|
$linkprotpburl = $info{'linkprotpburl'}; |
} elsif ($info{'linkkey'} ne '') { |
} elsif ($info{'linkkey'} ne '') { |
$linkkey = $info{'linkkey'}; |
$linkkey = $info{'linkkey'}; |
} |
} |
Line 394 sub sso_login {
|
Line 396 sub sso_login {
|
$linkprot = $form{'linkprot'}; |
$linkprot = $form{'linkprot'}; |
$linkprotuser = $form{'linkprotuser'}; |
$linkprotuser = $form{'linkprotuser'}; |
$linkprotexit = $form{'linkprotexit'}; |
$linkprotexit = $form{'linkprotexit'}; |
|
$linkprotpbid = $form{'linkprotpbid'}; |
|
$linkprotpburl = $form{'linkprotpburl'}; |
} elsif ($form{'linkkey'} ne '') { |
} elsif ($form{'linkkey'} ne '') { |
$linkkey = $form{'linkkey'}; |
$linkkey = $form{'linkkey'}; |
} |
} |
Line 423 sub sso_login {
|
Line 427 sub sso_login {
|
$linkprot = $form{'linkprot'}; |
$linkprot = $form{'linkprot'}; |
$linkprotuser = $form{'linkprotuser'}; |
$linkprotuser = $form{'linkprotuser'}; |
$linkprotexit = $form{'linkprotexit'}; |
$linkprotexit = $form{'linkprotexit'}; |
|
$linkprotpbid = $form{'linkprotpbid'}; |
|
$linkprotpburl = $form{'linkprotpburl'}; |
} elsif ($form{'linkkey'} ne '') { |
} elsif ($form{'linkkey'} ne '') { |
$linkkey = $form{'linkkey'}; |
$linkkey = $form{'linkkey'}; |
} |
} |
Line 437 sub sso_login {
|
Line 443 sub sso_login {
|
if ($link_info{'linkprotexit'} ne '') { |
if ($link_info{'linkprotexit'} ne '') { |
$linkprotexit = $link_info{'linkprotexit'}; |
$linkprotexit = $link_info{'linkprotexit'}; |
} |
} |
|
if ($link_info{'linkprotpbid'} ne '') { |
|
$linkprotpbid = $link_info{'linkprotpbid'}; |
|
} |
|
if ($link_info{'linkprotpburl'} ne '') { |
|
$linkprotpburl = $link_info{'linkprotpburl'}; |
|
} |
} |
} |
my $delete = &Apache::lonnet::tmpdel($form{'ltoken'}); |
my $delete = &Apache::lonnet::tmpdel($form{'ltoken'}); |
delete($form{'ltoken'}); |
delete($form{'ltoken'}); |
Line 459 sub sso_login {
|
Line 471 sub sso_login {
|
linkprot => $linkprot, |
linkprot => $linkprot, |
linkprotuser => $linkprotuser, |
linkprotuser => $linkprotuser, |
linkprotexit => $linkprotexit, |
linkprotexit => $linkprotexit, |
|
linkprotpbid => $linkprotpbid, |
|
linkprotpburl => $linkprotpburl, |
); |
); |
if ($env{'form.lcssowin'}) { |
if ($env{'form.lcssowin'}) { |
$data{'lcssowin'} = $env{'form.lcssowin'}; |
$data{'lcssowin'} = $env{'form.lcssowin'}; |
Line 531 sub sso_login {
|
Line 545 sub sso_login {
|
if ($linkprotexit ne '') { |
if ($linkprotexit ne '') { |
$env{'request.linkprotexit'} = $linkprotexit; |
$env{'request.linkprotexit'} = $linkprotexit; |
} |
} |
|
if ($linkprotpbid ne '') { |
|
$env{'request.linkprotpbid'} = $linkprotpbid; |
|
} |
|
if ($linkprotpburl ne '') { |
|
$env{'request.linkprotpburl'} = $linkprotpburl; |
|
} |
} elsif ($linkkey ne '') { |
} elsif ($linkkey ne '') { |
$env{'request.linkkey'} = $linkkey; |
$env{'request.linkkey'} = $linkkey; |
} |
} |
Line 591 sub sso_login {
|
Line 611 sub sso_login {
|
if ($linkprotexit ne '') { |
if ($linkprotexit ne '') { |
$info{'linkprotexit'} = $linkprotexit; |
$info{'linkprotexit'} = $linkprotexit; |
} |
} |
|
if ($linkprotpbid ne '') { |
|
$info{'linkprotpbid'} = $linkprotpbid; |
|
} |
|
if ($linkprotpburl ne '') { |
|
$info{'linkprotpburl'} = $linkprotpburl; |
|
} |
} elsif ($linkkey ne '') { |
} elsif ($linkkey ne '') { |
$info{'linkkey'} = $linkkey; |
$info{'linkkey'} = $linkkey; |
} |
} |
Line 735 sub handler {
|
Line 761 sub handler {
|
} |
} |
} elsif ($env{'request.course.id'} && |
} elsif ($env{'request.course.id'} && |
(($requrl =~ m{^/adm/$match_domain/$match_username/aboutme$}) || |
(($requrl =~ m{^/adm/$match_domain/$match_username/aboutme$}) || |
($requrl =~ m{^/public/$cdom/$cnum/syllabus$}))) { |
($requrl eq "/public/$cdom/$cnum/syllabus") || |
|
($requrl =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}))) { |
my $query = $r->args; |
my $query = $r->args; |
if ($query) { |
if ($query) { |
foreach my $pair (split(/&/,$query)) { |
foreach my $pair (split(/&/,$query)) { |
Line 815 sub handler {
|
Line 842 sub handler {
|
linkprot => $info{'linkprot'}, |
linkprot => $info{'linkprot'}, |
linkprotuser => $info{'linkprotuser'}, |
linkprotuser => $info{'linkprotuser'}, |
linkprotexit => $info{'linkprotexit'}, |
linkprotexit => $info{'linkprotexit'}, |
|
linkprotpbid => $info{'linkprotpbid'}, |
|
linkprotpburl => $info{'linkprotpburl'}, |
); |
); |
} elsif ($info{'ltoken'} ne '') { |
} elsif ($info{'ltoken'} ne '') { |
my %ltoken_info = &Apache::lonnet::tmpget($info{'ltoken'}); |
my %ltoken_info = &Apache::lonnet::tmpget($info{'ltoken'}); |
Line 825 sub handler {
|
Line 854 sub handler {
|
linkprot => $ltoken_info{'linkprot'}, |
linkprot => $ltoken_info{'linkprot'}, |
linkprotuser => $ltoken_info{'linkprotuser'}, |
linkprotuser => $ltoken_info{'linkprotuser'}, |
linkprotexit => $ltoken_info{'linkprotexit'}, |
linkprotexit => $ltoken_info{'linkprotexit'}, |
|
linkprotpbid => $ltoken_info{'linkprotpbid'}, |
|
linkprotpburl => $ltoken_info{'linkprotpburl'}, |
); |
); |
} |
} |
} |
} |
Line 948 sub handler {
|
Line 979 sub handler {
|
&Apache::blockedaccess::setup_handler($r); |
&Apache::blockedaccess::setup_handler($r); |
return OK; |
return OK; |
} |
} |
} elsif ($check_access) { |
} elsif ($check_access) { |
if ($handle eq '') { |
if ($handle eq '') { |
unless ($access eq 'F') { |
unless ($access eq 'F') { |
if ($requrl =~ m{^/res/$match_domain/$match_username/}) { |
if ($requrl =~ m{^/res/$match_domain/$match_username/}) { |