--- loncom/auth/migrateuser.pm	2021/12/12 18:34:48	1.25.2.5
+++ loncom/auth/migrateuser.pm	2017/11/30 15:14:51	1.26
@@ -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.26 2017/11/30 15:14:51 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 :remotehost);
+use Apache::Constants qw(:common :http :methods);
 use Apache::lonauth;
 use Apache::lonnet;
 use Apache::lonlocal;
@@ -53,7 +53,7 @@ sub goto_login {
 }
 
 
-sub sso_check {
+sub sso_lti_check {
     my ($data) = @_;
     my %extra_env;
     if (ref($data) eq 'HASH') {
@@ -64,6 +64,21 @@ sub sso_check {
             $extra_env{'request.sso.reloginserver'} = 
                 $data->{'sso.reloginserver'};
         }
+        if ($data->{'lti.login'}) {
+            $extra_env{'request.lti.login'} = $data->{'lti.login'};
+        }
+        if ($data->{'lti.passbackid'}) {
+            $extra_env{'request.lti.passbackid'} = $data->{'lti.passbackid'};
+        }
+        if ($data->{'lti.passbackurl'}) {
+            $extra_env{'request.lti.passbackurl'} = $data->{'lti.passbackurl'};
+        }
+        if ($data->{'lti.rosterid'}) {
+            $extra_env{'request.lti.rosterid'} = $data->{'lti.rosterid'};
+        }
+        if ($data->{'lti.rosterurl'}) {
+            $extra_env{'request.lti.rosterurl'} = $data->{'lti.rosterurl'};
+        }
     }
     return \%extra_env;
 }
@@ -161,8 +176,6 @@ 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 />'.
@@ -173,11 +186,6 @@ sub ip_changed {
                     }
                 }
             }
-            unless ($hosthere) {
-                if (($dataref->{'balancer'}) && ($dataref->{'balcookie'})) {
-                    &Apache::lonnet::delbalcookie($dataref->{'balcookie'},$dataref->{'balancer'});
-                }
-            }
         }
         if ($dataref->{'sso.login'}) {
             $url .= '/adm/roles';
@@ -191,17 +199,19 @@ sub ip_changed {
         my %info= (
                     'domain'          => $udom,
                     'username'        => $dataref->{'username'},
+                    'role'            => $dataref->{'role'},
                     'sessionserver'   => $lonhost,
                   );
-        my @names = ('origurl','symb','role');
-        foreach my $name (@names) {
-            if ($dataref->{$name} ne '') {
-                $info{$name} = $dataref->{$name};
-            }
+        if ($dataref->{'origurl'}) {
+            $info{'origurl'} = $dataref->{'origurl'};
         }
-        my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto,'link');
+        if ($dataref->{'symb'}) {
+            $info{'symb'} = $dataref->{'symb'};
+        }
+        my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto);
         unless ($iptoken eq 'conlost') {
-            $url .= (($url =~ /\?/) ? '&' : '?') . 'iptoken='.$iptoken;
+            $url .= ($url =~ /\?/) ? '&' : '?';
+            $url .= 'iptoken='.$iptoken;
         }
         $r->print(&Apache::loncommon::start_page($title,undef,
                                                  {'redirect' =>
@@ -234,10 +244,9 @@ sub handler {
     if (!defined($data{'username'}) || !defined($data{'domain'})) {
         return &goto_login($r);
     }
-    my $ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP); 
-    if ($data{'ip'} ne $ip) {
+    if ($data{'ip'} ne $ENV{'REMOTE_ADDR'}) {
         &Apache::lonnet::logthis('IP change when session migration requested -- was: '.
-                 $data{'ip'}.'; now: '.$ip.' for '.$data{'username'}.':'.$data{'domain'});
+                 $data{'ip'}.'; now: '.$ENV{'REMOTE_ADDR'}.' for '.$data{'username'}.':'.$data{'domain'});
 	return &ip_changed($r,$data{'domain'},$data{'server'},\%data);
     }
 
@@ -249,30 +258,9 @@ sub handler {
     }
     if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r,$udom); }
 
-    my $extra_env = &sso_check(\%data);
-    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'} };
-                }
-            }
-        }
-    }
+    my $extra_env = &sso_lti_check(\%data);
 
-    my (%form,$cid);
+    my %form;
     if ($data{'symb'} ne '') {
         $form{'symb'} = $data{'symb'};
     }
@@ -282,27 +270,9 @@ 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);
 
-# 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 (!$data{'role'}) {
+	my $handle = &Apache::lonnet::check_for_valid_session($r);
 	if ($handle) {
 	    &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
 						     $handle);
@@ -319,8 +289,7 @@ sub handler {
                 $desturl = $data{'origurl'};
             }
 	    &Apache::lonauth::success($r,$data{'username'},$data{'domain'},
-				      $home,$desturl,$extra_env,\%form,'',
-                                      $expirepub);
+				      $home,$desturl,$extra_env,\%form);
 
 	}
 	return OK;
@@ -332,7 +301,7 @@ sub handler {
         $next_url .= '&amp;orgurl='.&escape($data{'origurl'});
     }
     &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home,
-			      $next_url,$extra_env,\%form,$cid);
+			      $next_url,$extra_env,\%form);
     return OK;
 }