--- loncom/auth/migrateuser.pm	2018/12/07 23:16:50	1.40
+++ loncom/auth/migrateuser.pm	2020/05/24 11:25:29	1.47
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.40 2018/12/07 23:16:50 raeburn Exp $
+# $Id: migrateuser.pm,v 1.47 2020/05/24 11:25:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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;
 }
@@ -340,7 +337,11 @@ 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') {
@@ -362,6 +363,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;
 }
@@ -626,7 +634,7 @@ sub handler {
             return &goto_login($r,$udom,\%data);
         }
     }
-    
+
     my $rolemsg;
     if ($data{'role'}) {
         $rolemsg = "role: $data{'role'}";
@@ -645,6 +653,13 @@ 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'} };
+        }
+    }
 
     if (($data{'conlost'}) && ($data{'server'})) {
         my @conlosts = split(/,/,$data{'conlost'});
@@ -656,7 +671,7 @@ sub handler {
         }
     }
 
-    my %form;
+    my (%form,$cid);
     if ($data{'symb'} ne '') {
         $form{'symb'} = $data{'symb'};
     }
@@ -666,12 +681,67 @@ 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 '') {
+                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'}) {
                 my $needslogout;
                 if ($env{'request.lti.login'}) {
@@ -757,19 +827,59 @@ 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;
+                        } 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;
-            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);
@@ -777,18 +887,51 @@ 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,$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,'',$cid);
+    }
     return OK;
 }