--- loncom/auth/switchserver.pm	2018/11/24 16:19:04	1.42
+++ loncom/auth/switchserver.pm	2020/10/20 01:38:12	1.50
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.42 2018/11/24 16:19:04 raeburn Exp $
+# $Id: switchserver.pm,v 1.50 2020/10/20 01:38:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,7 +31,6 @@ package Apache::switchserver;
 use strict;
 use Apache::Constants qw(:common);
 use Apache::lonnet;
-use Apache::lonmenu;
 use Digest::MD5 qw(md5_hex);
 use CGI::Cookie();
 use Apache::lonlocal;
@@ -57,9 +56,13 @@ sub init_env {
 sub do_redirect {
     my ($r,$url,$only_body,$extra_text) = @_;
     $r->send_http_header;
+    my $delay = 0.5;
+    if ($only_body) {
+        $delay = 0;
+    }
     my $start_page = 
 	&Apache::loncommon::start_page('Switching Server ...',undef,
-				       {'redirect'       => [0.5,$url],
+				       {'redirect'       => [$delay,$url],
 					'only_body'      => $only_body,});
     my $end_page   = &Apache::loncommon::end_page();
     $r->print($start_page.$extra_text.$end_page);
@@ -69,6 +72,24 @@ sub do_redirect {
     return OK;
 }
 
+sub balancer_cookieid {
+    my ($r,$desthost,$uname,$udom) = @_;
+    my @hosts = &Apache::lonnet::current_machine_ids();
+    my $newcookieid;
+    unless (grep(/^\Q$desthost\E$/,@hosts)) {
+        my $balancedir=$r->dir_config('lonBalanceDir');
+        $newcookieid = &md5_hex(&md5_hex(time.{}.rand().$$));
+        my $cookie = $udom.'_'.$uname.'_'.$newcookieid;
+        my $balcookie = "balanceID=$cookie; path=/; HttpOnly;";
+        if (open(my $fh,'>',"$balancedir/$cookie.id")) {
+            print $fh $desthost;
+            close($fh);
+            $r->headers_out->add('Set-cookie' => $balcookie);
+        }
+    }
+    return $newcookieid;
+}
+
 sub flush_course_logs {
     &Apache::lonnet::flushcourselogs();
     return OK;
@@ -117,11 +138,11 @@ sub handler {
     }
 
     my $skip_canhost_check = '';
+    my $now = time;
     if ($env{'form.role'}) {
         if (!exists($env{'user.role.'.$env{'form.role'}})) {
             delete($env{'form.role'});
         } else {
-            my $now = time;
             my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.role'}});
             if (($start && $start > $now) || ($end && $end < $now)) {
                 delete($env{'form.role'});
@@ -132,8 +153,8 @@ sub handler {
             } elsif ($env{'form.role'} =~ m{^[ac]a\./($match_domain)/($match_username)$}) {
                 my ($audom,$auname) = ($1,$2);
                 if (&Apache::lonnet::homeserver($auname,$audom) eq $env{'form.otherserver'}) {
-                    if ((&Apache::lonnet::will_trust('othcoau',$audom,$env{'user.domain'})) &&
-                        (&Apache::lonnet::will_trust('coremau',$env{'user.domain'},$audom))) {                             
+                    if ((&Apache::lonnet::will_trust('othcoau',$env{'user.domain'},$audom)) &&
+                        (&Apache::lonnet::will_trust('coaurem',$audom,$env{'user.domain'}))) {                             
                         $skip_canhost_check = 1;
                     }
                 }
@@ -177,7 +198,6 @@ sub handler {
             }
         }
     }
-    my $now = time;
     my %temp=('switchserver' => $now.':'.$env{'form.otherserver'},
 	      $env{'form.role'});
     &Apache::lonnet::put('email_status',\%temp);
@@ -214,39 +234,44 @@ sub handler {
 	   
 # ---------------------------------------------------------------- Get handover
 
-    my $newcookieid;
-    (my $is_balancer,undef,my $setcookie) =
-        &Apache::lonnet::check_loadbalancing($env{'user.name'},$env{'user.domain'});
+    my ($is_balancer,$setcookie,$newcookieid,$offloadto,$dom_balancers);
+    my $only_body = 0;
+    ($is_balancer,undef,$setcookie,$offloadto,$dom_balancers) =
+        &Apache::lonnet::check_loadbalancing($env{'user.name'},$env{'user.domain'},'switchserver');
     if ($is_balancer && $setcookie && $env{'form.otherserver'}) {
 
         # Set a balancer cookie unless browser already sent LON-CAPA load balancer
         # cookie which points at the target server
         my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r,1);
 
-        unless (($found_server eq $env{'form.otherserver'}) &&
-                ($balancer_cookie =~ /^\Q$env{'user.domain'}\E_\Q$env{'user.name'}\E_/)) {
-            my @hosts = &Apache::lonnet::current_machine_ids();
-            my $desthost = $env{'form.otherserver'};
-            unless (grep(/^\Q$desthost\E$/,@hosts)) {
-                my $balancedir=$r->dir_config('lonBalanceDir');
-                $newcookieid = &md5_hex(&md5_hex($now.{}.rand().$$));
-                my $cookie = $env{'user.domain'}.'_'.$env{'user.name'}.'_'.$newcookieid;
-                my $balcookie = "balanceID=$cookie; path=/; HttpOnly;";
-                if (open(my $fh,'>',"$balancedir/$cookie.id")) {
-                    print $fh $env{'form.otherserver'};
-                    close($fh);
-                }
-                $r->headers_out->add('Set-cookie' => $balcookie);
-            }
+        if (($found_server eq $env{'form.otherserver'}) &&
+            ($balancer_cookie =~ /^\Q$env{'user.domain'}\E_\Q$env{'user.name'}\E_/)) {
+            $only_body = 1;
+        } else {
+            $newcookieid = &balancer_cookieid($r,$env{'form.otherserver'},
+                                              $env{'user.name'},$env{'user.domain'});
         }
     }
 
-    my %info=('ip'       => $ENV{'REMOTE_ADDR'},
-	      'domain'   => $env{'user.domain'},
-	      'username' => $env{'user.name'},
-	      'role'     => $env{'form.role'},
-	      'server'   => $r->dir_config('lonHostID'),
-	      'balancer' => $is_balancer);
+    my %info=('ip'            => $ENV{'REMOTE_ADDR'},
+              'domain'        => $env{'user.domain'},
+              'username'      => $env{'user.name'},
+              'home'          => $env{'user.home'},
+              'role'          => $env{'form.role'},
+              'server'        => $r->dir_config('lonHostID'),
+              'balancer'      => $is_balancer,
+              'dom_balancers' => $dom_balancers,
+              'offloadto'     => '');
+    if (ref($offloadto) eq 'HASH') {
+        foreach my $key (keys(%{$offloadto})) {
+            if (ref($offloadto->{$key}) eq 'ARRAY') {
+                $info{'offloadto'} .= $key.'='.join(',',@{$offloadto->{$key}}).'&';
+            }
+        }
+        $info{'offloadto'} =~ s/\&$//;
+    } elsif (ref($offloadto) eq 'ARRAY') {
+        $info{'offloadto'} = join(',',@{$offloadto});
+    }
     if ($newcookieid) {
         $info{'balcookie'} = $newcookieid;
     }
@@ -262,6 +287,15 @@ sub handler {
     if ($env{'request.sso.reloginserver'}) {
         $info{'sso.reloginserver'} = $env{'request.sso.reloginserver'};
     }
+    if ($env{'request.linkprot'}) {
+        $info{'linkprot'} = $env{'request.linkprot'};
+    }
+    if ($env{'request.deeplink.login'}) {
+        $info{'deeplink.login'} = $env{'request.deeplink.login'};
+        if ($env{'request.linkkey'}) {
+            $info{'linkkey'} = $env{'request.linkkey'};
+        }
+    }
     if ($env{'request.lti.login'}) {
         $info{'lti.login'} = $env{'request.lti.login'};
     }
@@ -301,7 +335,7 @@ sub handler {
 	'&amp;username='.$env{'user.name'}.
 	'&amp;token='.$token;
 # --------------------------------------------------------------- Screen Output
-    return &do_redirect($r, $url, 0);
+    return &do_redirect($r, $url, $only_body);
 }
 
 1;