--- loncom/auth/migrateuser.pm	2019/01/27 16:02:43	1.43
+++ loncom/auth/migrateuser.pm	2021/10/26 14:20:40	1.53
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.43 2019/01/27 16:02:43 raeburn Exp $
+# $Id: migrateuser.pm,v 1.53 2021/10/26 14:20:40 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;
@@ -71,9 +71,6 @@ sub sso_check {
             $extra_env{'request.sso.reloginserver'} = 
                 $data->{'sso.reloginserver'};
         }
-        if (($data->{'balancer'}) && ($data->{'server'}) && ($data->{'balcookie'})) {
-            $extra_env{'request.balancercookie'} = $data->{'server'}.':'.$data->{'balcookie'};
-        }
     }
     return \%extra_env;
 }
@@ -256,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 .= '<br />'.
@@ -311,7 +310,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$/) &&
@@ -325,7 +324,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');
 
@@ -340,11 +339,15 @@ sub logout {
     }
     my (%info,%user_info,%lti_info);
     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');
     if (ref($data) eq 'HASH') {
-        %user_info=('ip'       => $ENV{'REMOTE_ADDR'},
+        %user_info=('ip'       => $ip,
                     'domain'   => $data->{'domain'},
                     'username' => $data->{'username'},
                     'home'     => $data->{'home'},
@@ -362,6 +365,13 @@ sub logout {
                                        {'redirect'       => [0.1,$url],
                                         'only_body'      => 1,}).
         &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);
     return;
 }
@@ -533,7 +543,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;
@@ -549,7 +559,7 @@ sub log_switch {
     } else {
         $logmsg .= " (no role)";
     }
-    $logmsg .= ' '.$ENV{'REMOTE_ADDR'};
+    $logmsg .= ' '.$ip;
     &Apache::lonnet::log($data->{'domain'},$data->{'username'},$data->{'home'},$logmsg);
 }
 
@@ -579,9 +589,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'}) {
@@ -645,18 +656,39 @@ sub handler {
     } elsif ((ref($lti_env) eq 'HASH') && (keys(%{$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'} };
+        }
+    } 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'})) {
         my @conlosts = split(/,/,$data{'conlost'});
         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'};
     }
@@ -666,17 +698,20 @@ sub handler {
     if ($data{'noloadbalance'} ne '') {
         $form{'noloadbalance'} = $data{'noloadbalance'};
     }
-
-    if (!$data{'role'}) {
+    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 = &Apache::lonnet::check_for_valid_session($r);
 	if ($handle) {
 	    &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
 						     $handle);
             if ($data{'linkprot'} ne '') {
+                &Apache::lonnet::appenv({'request.linkprot' => $data{'linkprot'}});
                 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)) {
@@ -697,19 +732,20 @@ sub handler {
                 } else {
                     &Apache::lonnet::appenv({'user.linkproturi' => $deeplink});
                 }
-            } elsif ($data{'deeplink.login'}) {
+            } elsif ($data{'linkkey'} ne '') {
+                &Apache::lonnet::appenv({'request.linkkey' => $data{'linkkey'}});
                 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)) {
@@ -720,6 +756,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'}) {
@@ -736,7 +774,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'};
@@ -807,36 +845,50 @@ 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->{'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'}};
@@ -844,9 +896,12 @@ sub handler {
                 }
             }
             my $skipcritical;
-            if (($data{'lti.login'}) && ($data{'lti.reqcrs'}) &&
-                ($data{'lti.reqrole'} eq 'cc')) {
-                $skipcritical = 1;
+            if ($data{'lti.login'}) {
+                if ((($data{'lti.reqcrs'}) &&
+                     ($data{'lti.reqrole'} eq 'cc')) ||
+                    ($data{'lti.selfenrollrole'})) {
+                    $skipcritical = 1;
+                }
             }
 	    &Apache::lonauth::success($r,$data{'username'},$data{'domain'},
 				      $home,$desturl,$extra_env,\%form,$skipcritical);
@@ -854,18 +909,63 @@ sub handler {
 	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{'lti.login'}) {
-            if (($data{'origurl'} =~ m{/default_\d+\.sequence$}) ||
-                ($data{'origurl'} =~ m{^/res/.+\.sequence$})) {
-                $next_url .= '&navmap=1';
+    if ($data{'lti.login'}) {
+        my $handle = &Apache::lonnet::check_for_valid_session($r);
+        if ($handle) {
+            &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
+                                                     $handle);
+            my $needslogout;
+            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,$ip,$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;
+    } elsif ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) {
+        $next_url=$data{'origurl'};
+    } 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);
+    } 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,'',$cid);
+    }
     return OK;
 }