--- loncom/auth/switchserver.pm	2018/12/02 13:56:10	1.45
+++ loncom/auth/switchserver.pm	2022/06/30 21:04:13	1.61
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.45 2018/12/02 13:56:10 raeburn Exp $
+# $Id: switchserver.pm,v 1.61 2022/06/30 21:04:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,7 +29,7 @@
 package Apache::switchserver;
 
 use strict;
-use Apache::Constants qw(:common);
+use Apache::Constants qw(:common :remotehost);
 use Apache::lonnet;
 use Digest::MD5 qw(md5_hex);
 use CGI::Cookie();
@@ -56,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 && !$extra_text) {
+        $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);
@@ -93,7 +97,7 @@ sub flush_course_logs {
 
 sub handler {
     my ($r) = @_;
-    
+
     my $handle=&init_env($r);
     if (!defined($handle)) { return FORBIDDEN; }
 
@@ -107,7 +111,7 @@ sub handler {
 						   $env{'user.name'});
 	if (! $env{'form.otherserver'}) {
 	    $env{'form.otherserver'} = 
-		&Apache::lonnet::spareserver(30000,undef,1);
+		&Apache::lonnet::spareserver($r,30000,undef,1);
 	}
 	$switch_to=&Apache::lonnet::hostname($env{'form.otherserver'});
     }
@@ -119,6 +123,10 @@ sub handler {
         if ($Apache::lonnet::protocol{$env{'form.otherserver'}} eq 'https') {
             $protocol = $Apache::lonnet::protocol{$env{'form.otherserver'}};
         }
+        unless ($env{'form.otherserver'} eq $r->dir_config('lonHostID')) {
+            my $alias = &Apache::lonnet::use_proxy_alias($r,$env{'form.otherserver'});
+            $switch_to = $alias if ($alias ne '');
+        }
     }
 
     if ($env{'user.name'} eq 'public'
@@ -149,8 +157,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;
                     }
                 }
@@ -207,7 +215,8 @@ sub handler {
     } else {
         $logmsg .= " (no role)";
     }
-    $logmsg .= ' '.$ENV{'REMOTE_ADDR'};
+    my $ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP);
+    $logmsg .= ' '.$ip;
     &Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
 			 $env{'user.home'},$logmsg);
 
@@ -227,26 +236,32 @@ sub handler {
 	return OK;
     }
 # -------------------------------------------------------- Menu script and info
-	   
+
 # ---------------------------------------------------------------- Get handover
 
-    my $newcookieid;
-    my ($is_balancer,$posshost,$setcookie,$offloadto,$dom_balancers) =
-        &Apache::lonnet::check_loadbalancing($env{'user.name'},$env{'user.domain'});
+    my ($is_balancer,$setcookie,$newcookieid,$otherbalcookie,$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_/)) {
+        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'});
         }
     }
+    if ((!$is_balancer) && ($env{'request.balancercookie'})) {
+        $otherbalcookie = $env{'request.balancercookie'};
+    }
 
-    my %info=('ip'            => $ENV{'REMOTE_ADDR'},
+    my %info=('ip'            => $ip,
               'domain'        => $env{'user.domain'},
               'username'      => $env{'user.name'},
               'home'          => $env{'user.home'},
@@ -267,6 +282,8 @@ sub handler {
     }
     if ($newcookieid) {
         $info{'balcookie'} = $newcookieid;
+    } elsif ($otherbalcookie) {
+        $info{'otherbalcookie'} = $otherbalcookie;
     }
     if ($env{'form.origurl'}) {
         $info{'origurl'} = $env{'form.origurl'};
@@ -274,12 +291,38 @@ sub handler {
     if ($env{'form.symb'}) {
         $info{'symb'} = $env{'form.symb'};
     }
+    my $ssologoutscript = ''; 
     if ($env{'request.sso.login'}) {
 	$info{'sso.login'} = $env{'request.sso.login'};
+        if (defined($r->dir_config("lonSSOUserLogoutScriptFile_$info{domain}"))) {
+            if (open(my $fh,'<',$r->dir_config("lonSSOUserLogoutScriptFile_$info{domain}"))) {
+                $ssologoutscript .= join('',<$fh>);
+                close($fh); 
+            }
+        }
+        if (defined($r->dir_config('lonSSOUserLogoutScriptFile'))) {
+            if (open(my $fh,'<',$r->dir_config('lonSSOUserLogoutScriptFile'))) {
+                $ssologoutscript .= join('',<$fh>);
+                close($fh);
+            }
+        }
     }
     if ($env{'request.sso.reloginserver'}) {
         $info{'sso.reloginserver'} = $env{'request.sso.reloginserver'};
     }
+    if ($env{'request.linkprot'}) {
+        $info{'linkprot'} = $env{'request.linkprot'};
+        foreach my $item ('linkprotuser','linkprotexit') {
+            if ($env{'request.'.$item}) {
+                $info{$item} = $env{'request.'.$item};
+            }
+        }
+    } elsif ($env{'request.linkkey'} ne '') {
+        $info{'linkkey'} = $env{'request.linkkey'};
+    }
+    if ($env{'request.deeplink.login'}) {
+        $info{'deeplink.login'} = $env{'request.deeplink.login'};
+    }
     if ($env{'request.lti.login'}) {
         $info{'lti.login'} = $env{'request.lti.login'};
     }
@@ -319,7 +362,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, $ssologoutscript);
 }
 
 1;