--- loncom/auth/migrateuser.pm 2019/06/16 22:27:06 1.45
+++ loncom/auth/migrateuser.pm 2022/02/24 00:13:54 1.58
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Starts a user off based of an existing token.
#
-# $Id: migrateuser.pm,v 1.45 2019/06/16 22:27:06 raeburn Exp $
+# $Id: migrateuser.pm,v 1.58 2022/02/24 00:13:54 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,7 +30,7 @@ package Apache::migrateuser;
use strict;
use LONCAPA qw(:DEFAULT :match);
-use Apache::Constants qw(:common :http :methods);
+use Apache::Constants qw(:common :http :methods :remotehost);
use Apache::lonauth;
use Apache::lonnet;
use Apache::loncommon;
@@ -253,6 +253,8 @@ sub ip_changed {
if ($hostname) {
my $protocol = $Apache::lonnet::protocol{$switchto};
$protocol = 'http' if ($protocol ne 'https');
+ my $alias = &Apache::lonnet::use_proxy_alias($r,$switchto);
+ $hostname = $alias if ($alias ne '');
$url = $protocol.'://'.$hostname;
if ($rule_in_effect eq 'balancer') {
$message .= '
'.
@@ -281,19 +283,17 @@ sub ip_changed {
my %info= (
'domain' => $udom,
'username' => $dataref->{'username'},
- 'role' => $dataref->{'role'},
'sessionserver' => $lonhost,
);
- if ($dataref->{'origurl'}) {
- $info{'origurl'} = $dataref->{'origurl'};
- }
- if ($dataref->{'symb'}) {
- $info{'symb'} = $dataref->{'symb'};
+ my @names = ('origurl','symb','role','linkprot','linkkey');
+ foreach my $name (@names) {
+ if ($dataref->{$name} ne '') {
+ $info{$name} = $dataref->{$name};
+ }
}
- 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' =>
@@ -308,7 +308,7 @@ sub ip_changed {
}
sub logout {
- my ($r,$handle,$data,$lti_env) = @_;
+ my ($r,$ip,$handle,$data,$lti_env) = @_;
my $lonidsdir=$r->dir_config('lonIDsDir');
if (unlink("$lonidsdir/$handle.id")) {
if (($env{'user.linkedenv'} =~ /^[a-f0-9]+_linked$/) &&
@@ -322,7 +322,7 @@ sub logout {
&Apache::lonnet::log($env{'user.domain'},
$env{'user.name'},
$env{'user.home'},
- "Logout $ENV{'REMOTE_ADDR'}");
+ "Logout $ip");
&Apache::loncommon::content_type($r,'text/html');
@@ -345,7 +345,7 @@ sub logout {
}
my $lonhost = $r->dir_config('lonHostID');
if (ref($data) eq 'HASH') {
- %user_info=('ip' => $ENV{'REMOTE_ADDR'},
+ %user_info=('ip' => $ip,
'domain' => $data->{'domain'},
'username' => $data->{'username'},
'home' => $data->{'home'},
@@ -541,7 +541,7 @@ sub do_server_switch {
}
sub log_switch {
- my ($r,$data,$lti_env) = @_;
+ my ($r,$data,$lti_env,$ip) = @_;
my $lonhost = $r->dir_config('lonHostID');
return unless ((ref($data) eq 'HASH') && (ref($lti_env) eq 'HASH'));
my $now = time;
@@ -557,7 +557,7 @@ sub log_switch {
} else {
$logmsg .= " (no role)";
}
- $logmsg .= ' '.$ENV{'REMOTE_ADDR'};
+ $logmsg .= ' '.$ip;
&Apache::lonnet::log($data->{'domain'},$data->{'username'},$data->{'home'},$logmsg);
}
@@ -587,9 +587,10 @@ sub handler {
}
my ($home,@ids);
@ids=&Apache::lonnet::current_machine_ids();
- if ($data{'ip'} ne $ENV{'REMOTE_ADDR'}) {
+ my $ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP);
+ if ($data{'ip'} ne $ip) {
&Apache::lonnet::logthis('IP change when session migration requested -- was: '.
- $data{'ip'}.'; now: '.$ENV{'REMOTE_ADDR'}.' for '.$data{'username'}.':'.$data{'domain'});
+ $data{'ip'}.'; now: '.$ip.' for '.$data{'username'}.':'.$data{'domain'});
return &ip_changed($r,$data{'domain'},$data{'server'},\@ids,\%data);
}
if ($data{'loncfail'}) {
@@ -659,6 +660,20 @@ sub handler {
} else {
$extra_env = { 'request.balancercookie' => $data{'server'}.':'.$data{'balcookie'} };
}
+ } elsif (($data{'server'}) && ($data{'otherbalcookie'})) {
+ my ($balancer,$balcookie) = split(/:/,$data{'otherbalcookie'});
+ if (defined(&Apache::lonnet::hostname($balancer)) && $balcookie =~ /^[a-f0-9]{32}$/) {
+ my $baldom = &Apache::lonnet::host_domain($balancer);
+ if (&Apache::lonnet::shared_institution($baldom)) {
+ my $cookieid = join('_',$udom,$data{'username'},$balcookie);
+ &Apache::lonnet::updatebalcookie($cookieid,$balancer,$data{'server'});
+ if (ref($extra_env) eq 'HASH') {
+ $extra_env->{'request.balancercookie'} = $data{'otherbalcookie'};
+ } else {
+ $extra_env = { 'request.balancercookie' => $data{'otherbalcookie'} };
+ }
+ }
+ }
}
if (($data{'conlost'}) && ($data{'server'})) {
@@ -666,12 +681,12 @@ sub handler {
my $switchfrom = $data{'server'};
if (@conlosts) {
if (grep(/^\Q$switchfrom\E$/,@conlosts)) {
- &log_switch($r,\%data,$extra_env);
+ &log_switch($r,\%data,$extra_env,$ip);
}
}
}
- my %form;
+ my (%form,$cid);
if ($data{'symb'} ne '') {
$form{'symb'} = $data{'symb'};
}
@@ -681,17 +696,59 @@ sub handler {
if ($data{'noloadbalance'} ne '') {
$form{'noloadbalance'} = $data{'noloadbalance'};
}
+ if ($data{'role'}) {
+ if ($data{'role'} =~ m{\./($match_domain)/($match_courseid)(?:/\w+|$)}) {
+ unless (&Apache::lonnet::homeserver($2,$1) eq 'no_host') {
+ $cid = $1.'_'.$2;
+ }
+ }
+ } else {
+ my ($handle,$expirepub);
+ $handle = &Apache::lonnet::check_for_valid_session($r);
- if (!$data{'role'}) {
- my $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;
+ if ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) {
+ unless ($env{'request.linkprot'} eq $data{'linkprot'}) {
+ $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','deeplink.login') {
+ if ($data{$item}) {
+ $linkprot_env{'request.'.$item} = $data{$item};
+ }
+ }
+ &logout($r,$ip,$handle,\%data,\%linkprot_env);
+ return OK;
+ }
+ &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)) {
@@ -712,19 +769,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)) {
@@ -735,6 +796,8 @@ sub handler {
&Apache::lonnet::appenv({'user.keyedlinkuri' => $deeplink});
}
}
+ }
+ if ($data{'deeplink.login'}) {
&Apache::lonnet::appenv({'request.deeplink.login' => $data{'deeplink.login'}});
}
if ($data{'lti.login'}) {
@@ -751,7 +814,7 @@ sub handler {
# (and session) or has an LTI session cookie for a different username,
# logout the existing session, and start a new one
if ($needslogout) {
- &logout($r,$handle,\%data,$lti_env);
+ &logout($r,$ip,$handle,\%data,$lti_env);
} elsif (($data{'lti.reqcrs'}) && ($data{'lti.reqrole'} eq 'cc')) {
$form{'lti.reqcrs'} = $data{'lti.reqcrs'};
$form{'lti.reqrole'} = $data{'lti.reqrole'};
@@ -814,7 +877,26 @@ 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'};
+ } 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 {
@@ -822,37 +904,51 @@ sub handler {
}
} else {
my $desturl = '/adm/roles';
- if ($data{'origurl'} ne '') {
- $desturl = $data{'origurl'};
- if ($data{'lti.login'}) {
- $desturl = $data{'origurl'};
+ if ($data{'lti.login'}) {
+ if ($data{'lti.selfenrollrole'}) {
+ $desturl .= '?selectrole=1&'.
+ &escape($data{'lti.selfenrollrole'}).'=1';
+ if ($data{'origurl'} ne '') {
+ $desturl .= '&orgurl='.$data{'origurl'};
+ if ($data{'origurl'} =~ m{/default_\d+\.sequence$}) {
+ $desturl .= '&navmap=1';
+ }
+ }
+ } elsif ($data{'origurl'} ne '') {
+ $desturl = $data{'origurl'};
if ($desturl =~ m{/default_\d+\.sequence$}) {
$desturl .= (($desturl =~/\?/)?'&':'?').'navmap=1';
}
}
+ } elsif ($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,};
- }
- }
- } 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'}};
+ 'user.linkproturi' => $linkuri,
+ 'request.linkprot' => $data{'linkprot'}};
}
}
+ } 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'}};
}
@@ -867,7 +963,8 @@ sub handler {
}
}
&Apache::lonauth::success($r,$data{'username'},$data{'domain'},
- $home,$desturl,$extra_env,\%form,$skipcritical);
+ $home,$desturl,$extra_env,\%form,$skipcritical,'',
+ $expirepub);
}
return OK;
}
@@ -887,7 +984,7 @@ sub handler {
$needslogout = 1;
}
if ($needslogout) {
- &logout($r,$handle,\%data,$lti_env);
+ &logout($r,$ip,$handle,\%data,$lti_env);
return OK;
}
}
@@ -899,23 +996,35 @@ 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';
+ $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1';
if ($data{'origurl'} ne '') {
- $next_url .= '&orgurl='.&escape($data{'origurl'});
+ $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';
+ $next_url .= '&navmap=1';
}
}
if ($reuse_session) {
$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,
- $next_url,$extra_env,\%form);
+ $next_url,$extra_env,\%form,'',$cid);
}
return OK;
}
The server encountered an internal error or misconfiguration and was unable to complete your request.
Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.
More information about this error may be available in the server error log.