--- loncom/auth/migrateuser.pm	2014/10/05 13:49:11	1.22
+++ loncom/auth/migrateuser.pm	2019/08/01 15:38:36	1.25.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.22 2014/10/05 13:49:11 raeburn Exp $
+# $Id: migrateuser.pm,v 1.25.2.1 2019/08/01 15:38:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,12 +37,15 @@ use Apache::lonlocal;
 use Apache::lonlogin();
 
 sub goto_login {
-    my ($r) = @_;
+    my ($r,$domain) = @_;
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
+    my $url = '/adm/login';
+    if ($domain) {
+        $url .= '?domain='.$domain;
+    }
     $r->print(&Apache::loncommon::start_page('Going to login',undef,
-					     {'redirect' =>
-						  [0,'/adm/login'],}).
+					     {'redirect' => [0,$url],}).
 	      '<h1>'.&mt('One moment please...').'</h1>'.
 	      '<p>'.&mt('Transferring to login page.').'</p>'.
 	      &Apache::loncommon::end_page());
@@ -114,36 +117,63 @@ sub ip_changed {
         my $url;
         my $lonhost= $r->dir_config('lonHostID');
         my $switchto = $lonhost;
-        if ($rule_in_effect eq 'balancer') {
+        if ($rule_in_effect ne 'offloadedto') {
             my $hosthere;
-            if ($dataref->{'role'}) {
-                my ($adom,$aname);
-                if ($dataref->{'role'} =~ m{^au\./($match_domain)/$}) {
-                    $adom = $1;
-                    $aname = $dataref->{'username'};
-                } elsif ($dataref->{'role'} =~ m{^(?:ca|aa)\./($match_domain)/($match_username)$}) {
-                    $adom = $1;
-                    $aname = $2;
-                }
-                if ($adom ne '' && $aname ne '') {
-                    my $ahome = &Apache::lonnet::homeserver($aname,$adom);
-                    unless ($ahome eq 'no_host') {
-                        my @ids=&Apache::lonnet::current_machine_ids();
-                        if ($ahome && grep(/^\Q$ahome\E$/,@ids)) {
-                            $hosthere = 1;
+            my @ids=&Apache::lonnet::current_machine_ids();
+            unless ($rule_in_effect eq 'balancer') {
+                if (grep(/^\Q$rule_in_effect\E$/,@ids)) {
+                    $hosthere = 1;
+                }
+            }
+            unless ($hosthere) {
+                if ($dataref->{'role'}) {
+                    my ($adom,$aname);
+                    if ($dataref->{'role'} =~ m{^au\./($match_domain)/$}) {
+                        $adom = $1;
+                        $aname = $dataref->{'username'};
+                    } elsif ($dataref->{'role'} =~ m{^(?:ca|aa)\./($match_domain)/($match_username)$}) {
+                        $adom = $1;
+                        $aname = $2;
+                    }
+                    if ($adom ne '' && $aname ne '') {
+                        my $ahome = &Apache::lonnet::homeserver($aname,$adom);
+                        unless ($ahome eq 'no_host') {
+                            if ($ahome && grep(/^\Q$ahome\E$/,@ids)) {
+                                $hosthere = 1;
+                            }
                         }
                     }
                 }
             }
-            unless ($hosthere) { 
-                my $hostname = &Apache::lonnet::hostname($dataref->{'server'});
+            unless ($hosthere) {
+                my $hostname;
+                if ($rule_in_effect eq 'balancer') {
+                    $hostname = &Apache::lonnet::hostname($dataref->{'server'});
+                    if ($hostname) {
+                        $switchto = $dataref->{'server'};
+                    }
+                } else {
+                    $hostname = &Apache::lonnet::hostname($rule_in_effect);
+                    if ($hostname) {
+                        $switchto = $rule_in_effect;
+                    }
+                }
                 if ($hostname) {
-                    $switchto = $dataref->{'server'};
                     my $protocol = $Apache::lonnet::protocol{$switchto};
                     $protocol = 'http' if ($protocol ne 'https');
                     $url = $protocol.'://'.$hostname;
-                    $message .= '<br />'.
-                                &mt('As a result, your LON-CAPA session is being redirected to the server where you originally logged in.');
+                    if ($rule_in_effect eq 'balancer') {
+                        $message .= '<br />'.
+                                    &mt('As a result, your LON-CAPA session is being redirected to the server where you originally logged in.');
+                    } else {
+                        $message .= '<br />'.
+                                    &mt('As a result, your LON-CAPA session is being redirected.');
+                    }
+                }
+            }
+            unless ($hosthere) {
+                if (($dataref->{'balancer'}) && ($dataref->{'balcookie'})) {
+                    &Apache::lonnet::delbalcookie($dataref->{'balcookie'},$dataref->{'balancer'});
                 }
             }
         }
@@ -151,10 +181,13 @@ sub ip_changed {
             $url .= '/adm/roles';
         } else {
             $url .= '/adm/login';
+            if ($udom) {
+                $url .= '?domain='.$udom;
+            }
             $message .= '<br />'.&mt('You will need to provide your password one more time.');
         }
         my %info= (
-                    'domain'          => $dataref->{'domain'},
+                    'domain'          => $udom,
                     'username'        => $dataref->{'username'},
                     'role'            => $dataref->{'role'},
                     'sessionserver'   => $lonhost,
@@ -167,7 +200,8 @@ sub ip_changed {
         }
         my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto);
         unless ($iptoken eq 'conlost') {
-            $url .= '?iptoken='.$iptoken;
+            $url .= ($url =~ /\?/) ? '&' : '?';
+            $url .= 'iptoken='.$iptoken;
         }
         $r->print(&Apache::loncommon::start_page($title,undef,
                                                  {'redirect' =>
@@ -201,14 +235,27 @@ sub handler {
         return &goto_login($r);
     }
     if ($data{'ip'} ne $ENV{'REMOTE_ADDR'}) {
+        &Apache::lonnet::logthis('IP change when session migration requested -- was: '.
+                 $data{'ip'}.'; now: '.$ENV{'REMOTE_ADDR'}.' for '.$data{'username'}.':'.$data{'domain'});
 	return &ip_changed($r,$data{'domain'},$data{'server'},\%data);
     }
 
     &Apache::lonnet::logthis("Allowing access for $data{'username'}:$data{'domain'} to $data{'role'}");
     my $home=&Apache::lonnet::homeserver($data{'username'},$data{'domain'});
-    if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r); }
+    my $udom;
+    if (&Apache::lonnet::domain($data{'domain'})) {
+        $udom=$data{'domain'};
+    }
+    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'} };
+        }
+    }
 
     my %form;
     if ($data{'symb'} ne '') {
@@ -217,6 +264,9 @@ sub handler {
     if ($data{'iptoken'} ne '') {
         $form{'iptoken'} = $data{'iptoken'};
     }
+    if ($data{'noloadbalance'} ne '') {
+        $form{'noloadbalance'} = $data{'noloadbalance'};
+    }
 
     if (!$data{'role'}) {
 	my $handle = &Apache::lonnet::check_for_valid_session($r);