--- loncom/auth/migrateuser.pm 2021/12/12 18:34:48 1.25.2.5 +++ loncom/auth/migrateuser.pm 2022/01/01 17:00:40 1.25.2.5.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network # Starts a user off based of an existing token. # -# $Id: migrateuser.pm,v 1.25.2.5 2021/12/12 18:34:48 raeburn Exp $ +# $Id: migrateuser.pm,v 1.25.2.5.2.1 2022/01/01 17:00:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -52,7 +52,6 @@ sub goto_login { return OK; } - sub sso_check { my ($data) = @_; my %extra_env; @@ -193,7 +192,7 @@ sub ip_changed { 'username' => $dataref->{'username'}, 'sessionserver' => $lonhost, ); - my @names = ('origurl','symb','role'); + my @names = ('origurl','symb','role','linkprot','linkkey'); foreach my $name (@names) { if ($dataref->{$name} ne '') { $info{$name} = $dataref->{$name}; @@ -217,7 +216,7 @@ sub ip_changed { sub handler { my ($r) = @_; - + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']); my %data = &Apache::lonnet::tmpget($env{'form.token'}); if (keys(%data) == 0) { @@ -290,7 +289,7 @@ sub handler { } } else { my ($handle,$expirepub); - $handle = &Apache::lonnet::check_for_valid_session($r); + $handle = &Apache::lonnet::check_for_valid_session($r); # For "public user" - remove any existing "public" cookie so actual user is logged in. if ($handle) { @@ -306,8 +305,102 @@ sub handler { if ($handle) { &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'), $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 '') { + &Apache::lonnet::appenv({'request.linkprot' => $data{'linkprot'}}); + 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)) { + 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{'linkkey'} ne '') { + &Apache::lonnet::appenv({'request.linkkey' => $data{'linkkey'}}); + if ($env{'request.linkprot'}) { + &Apache::lonnet::delenv('request.linkprot'); + } + my $deeplink = $data{'deeplink.login'}; + 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)) { + push(@keyeduris,$deeplink); + &Apache::lonnet::appenv({'user.keyedlinkuri' => join(',',sort(@keyeduris))}); + } + } else { + &Apache::lonnet::appenv({'user.keyedlinkuri' => $deeplink}); + } + } + } + if ($data{'deeplink.login'}) { + &Apache::lonnet::appenv({'request.deeplink.login' => $data{'deeplink.login'}}); + } if ($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'}) { $r->internal_redirect('/adm/navmaps'); } else { @@ -317,20 +410,61 @@ sub handler { my $desturl = '/adm/roles'; if ($data{'origurl'} ne '') { $desturl = $data{'origurl'}; + 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; + $extra_env->{'request.linkprot'} = $data{'linkprot'}; + } else { + $extra_env = {'user.linkprotector' => $linkprotector, + 'user.linkproturi' => $linkuri, + 'request.linkprot' => $data{'linkprot'}}; + } + } + } elsif ($data{'linkkey'}) { + if (ref($extra_env) eq 'HASH') { + $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'}}; + } + } } &Apache::lonauth::success($r,$data{'username'},$data{'domain'}, $home,$desturl,$extra_env,\%form,'', $expirepub); - } return OK; - } my $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; if ($data{'origurl'} ne '') { $next_url .= '&orgurl='.&escape($data{'origurl'}); } + 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'}; + } 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); return OK;