--- loncom/auth/switchserver.pm 2021/12/12 21:07:21 1.35.2.6 +++ loncom/auth/switchserver.pm 2017/02/25 20:00:36 1.36 @@ -1,7 +1,7 @@ # The LearningOnline Network # Switch Servers Handler # -# $Id: switchserver.pm,v 1.35.2.6 2021/12/12 21:07:21 raeburn Exp $ +# $Id: switchserver.pm,v 1.36 2017/02/25 20:00:36 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,9 +29,9 @@ package Apache::switchserver; use strict; -use Apache::Constants qw(:common :remotehost); +use Apache::Constants qw(:common); use Apache::lonnet; -use Digest::MD5 qw(md5_hex); +use Apache::lonmenu; use CGI::Cookie(); use Apache::lonlocal; use LONCAPA qw(:DEFAULT :match); @@ -49,20 +49,16 @@ sub init_env { } my $lonidsdir=$r->dir_config('lonIDsDir'); &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); - + return $r->dir_config('lonIDsDir')."/$handle.id"; } 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' => [$delay,$url], + {'redirect' => [0.5,$url], 'only_body' => $only_body,}); my $end_page = &Apache::loncommon::end_page(); $r->print($start_page.$extra_text.$end_page); @@ -72,24 +68,6 @@ 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; @@ -111,7 +89,7 @@ sub handler { $env{'user.name'}); if (! $env{'form.otherserver'}) { $env{'form.otherserver'} = - &Apache::lonnet::spareserver($r,30000,undef,1); + &Apache::lonnet::spareserver(30000,undef,1); } $switch_to=&Apache::lonnet::hostname($env{'form.otherserver'}); } @@ -123,11 +101,7 @@ 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') { @@ -142,11 +116,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'}); @@ -188,17 +162,15 @@ sub handler { } #remove session env, and log event - 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"); - } + unlink($handle); + if ($env{'user.linkedenv'} ne '') { + my $lonidsdir=$r->dir_config('lonIDsDir'); + if ((-l $env{'user.linkedenv'}) && + (readlink($env{'user.linkedenv'}) eq "$lonidsdir/$handle.id")) { + unlink($env{'user.linkedenv'}); } } - my %temp=('switchserver' => $now.':'.$env{'form.otherserver'}, + my %temp=('switchserver' => time.':'.$env{'form.otherserver'}, $env{'form.role'}); &Apache::lonnet::put('email_status',\%temp); my $logmsg = "Switch Server to $env{'form.otherserver'}"; @@ -207,84 +179,47 @@ sub handler { } else { $logmsg .= " (no role)"; } - my $ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP); - $logmsg .= ' '.$ip; + $logmsg .= ' '.$ENV{'REMOTE_ADDR'}; &Apache::lonnet::log($env{'user.domain'},$env{'user.name'}, $env{'user.home'},$logmsg); &Apache::loncommon::content_type($r,'text/html'); - #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); + #expire the cookie + my $c = new CGI::Cookie(-name => 'lonID', + -value => '', + -expires => '-10y',); + $r->headers_out->add('Set-cookie' => $c); + if ($env{'user.linkedenv'}) { + my $linked = new CGI::Cookie(-name => 'lonLinkID', + -value => '', + -expires => '-10y',); + $r->headers_out->add('Set-cookie' => $linked); } + if ($r->header_only) { $r->send_http_header; return OK; } # -------------------------------------------------------- Menu script and info - + # ---------------------------------------------------------------- Get handover - my ($is_balancer,$setcookie,$newcookieid,$otherbalcookie); - my $only_body = 0; - ($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); - - 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' => $ip, + my ($is_balancer) = &Apache::lonnet::check_loadbalancing($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); - if ($newcookieid) { - $info{'balcookie'} = $newcookieid; - } elsif ($otherbalcookie) { - $info{'otherbalcookie'} = $otherbalcookie; - } if ($env{'form.origurl'}) { $info{'origurl'} = $env{'form.origurl'}; } 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'}; @@ -295,7 +230,7 @@ sub handler { '&username='.$env{'user.name'}. '&token='.$token; # --------------------------------------------------------------- Screen Output - return &do_redirect($r, $url, $only_body, $ssologoutscript); + return &do_redirect($r, $url, 0); } 1;