--- loncom/auth/switchserver.pm 2019/08/01 15:20:06 1.35.2.1 +++ loncom/auth/switchserver.pm 2022/07/08 15:52:52 1.35.2.6.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network # Switch Servers Handler # -# $Id: switchserver.pm,v 1.35.2.1 2019/08/01 15:20:06 raeburn Exp $ +# $Id: switchserver.pm,v 1.35.2.6.2.2 2022/07/08 15:52:52 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(); @@ -57,7 +57,7 @@ sub do_redirect { my ($r,$url,$only_body,$extra_text) = @_; $r->send_http_header; my $delay = 0.5; - if ($only_body) { + if ($only_body && !$extra_text) { $delay = 0; } my $start_page = @@ -97,7 +97,7 @@ sub flush_course_logs { sub handler { my ($r) = @_; - + my $handle=&init_env($r); if (!defined($handle)) { return FORBIDDEN; } @@ -111,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'}); } @@ -123,11 +123,21 @@ 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' && $env{'user.domain'} eq 'public') { my $url = $protocol.'://'.$switch_to.$r->uri; + unlink($handle); + #expire the cookie + my $c = new CGI::Cookie(-name => 'lonPubID', + -value => '', + -expires => '-10y',); + $r->header_out('Set-cookie' => $c); return &do_redirect($r,$url,1) } @@ -178,7 +188,16 @@ sub handler { } #remove session env, and log event - unlink($handle); + if (unlink($handle)) { + if ($env{'user.linkedenv'} ne '') { + my $lonidsdir=$r->dir_config('lonIDsDir'); + if (($env{'user.linkedenv'} =~ /^[a-f0-9]+_linked$/) && + (-l "$lonidsdir/$env{'user.linkedenv'}.id") && + (readlink("$lonidsdir/$env{'user.linkedenv'}.id") eq $handle)) { + unlink("$lonidsdir/$env{'user.linkedenv'}.id"); + } + } + } my %temp=('switchserver' => $now.':'.$env{'form.otherserver'}, $env{'form.role'}); &Apache::lonnet::put('email_status',\%temp); @@ -188,31 +207,36 @@ 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); &Apache::loncommon::content_type($r,'text/html'); - #expire the cookie - my $c = new CGI::Cookie(-name => 'lonID', - -value => '', - -expires => '-10y',); - $r->header_out('Set-cookie' => $c); - + #expire the cookies + my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); + foreach my $name (keys(%cookies)) { + next unless ($name =~ /^lon(|S|Link|Pub)ID$/); + my $c = new CGI::Cookie(-name => $name, + -value => '', + -expires => '-10y',); + $r->headers_out->add('Set-cookie' => $c); + } if ($r->header_only) { $r->send_http_header; return OK; } # -------------------------------------------------------- Menu script and info - + # ---------------------------------------------------------------- Get handover - my $newcookieid; + my ($is_balancer,$setcookie,$newcookieid,$otherbalcookie); my $only_body = 0; - my ($is_balancer,$posshost,$setcookie) = - &Apache::lonnet::check_loadbalancing($env{'user.name'},$env{'user.domain'}); + ($is_balancer,undef,$setcookie) = + &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); @@ -225,8 +249,11 @@ sub handler { $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'}, 'role' => $env{'form.role'}, @@ -234,6 +261,8 @@ sub handler { 'balancer' => $is_balancer); if ($newcookieid) { $info{'balcookie'} = $newcookieid; + } elsif ($otherbalcookie) { + $info{'otherbalcookie'} = $otherbalcookie; } if ($env{'form.origurl'}) { $info{'origurl'} = $env{'form.origurl'}; @@ -241,19 +270,45 @@ 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'}; + } my $token = &Apache::lonnet::tmpput(\%info,$env{'form.otherserver'}); my $url =$protocol.'://'.$switch_to.'/adm/login?'. 'domain='.$env{'user.domain'}. '&username='.$env{'user.name'}. '&token='.$token; # --------------------------------------------------------------- Screen Output - return &do_redirect($r, $url, $only_body); + return &do_redirect($r, $url, $only_body, $ssologoutscript); } 1;