--- loncom/auth/switchserver.pm 2022/01/01 16:33:13 1.35.2.6.2.1 +++ loncom/auth/switchserver.pm 2018/12/02 13:56:10 1.45 @@ -1,7 +1,7 @@ # The LearningOnline Network # Switch Servers Handler # -# $Id: switchserver.pm,v 1.35.2.6.2.1 2022/01/01 16:33:13 raeburn Exp $ +# $Id: switchserver.pm,v 1.45 2018/12/02 13:56:10 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,7 +29,7 @@ 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 CGI::Cookie(); @@ -56,13 +56,9 @@ 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' => [$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); @@ -111,7 +107,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,10 +119,6 @@ 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' @@ -155,8 +147,12 @@ sub handler { $skip_canhost_check = 1; } } elsif ($env{'form.role'} =~ m{^[ac]a\./($match_domain)/($match_username)$}) { - if (&Apache::lonnet::homeserver($2,$1) eq $env{'form.otherserver'}) { - $skip_canhost_check = 1; + 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))) { + $skip_canhost_check = 1; + } } } } @@ -204,11 +200,14 @@ sub handler { my $logmsg = "Switch Server to $env{'form.otherserver'}"; if ($env{'form.role'}) { $logmsg .= " with role: $env{'form.role'}"; + } elsif (($env{'form.lti.reqcrs'}) && ($env{'form.lti.reqrole'} eq 'cc')) { + $logmsg .= " to create new LTI course"; + } elsif ($env{'form.lti.selfenrollrole'}) { + $logmsg .= " to selfenroll with role: $env{'form.lti.selfenrollrole'}"; } 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); @@ -228,41 +227,46 @@ sub handler { 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'); + my $newcookieid; + my ($is_balancer,$posshost,$setcookie,$offloadto,$dom_balancers) = + &Apache::lonnet::check_loadbalancing($env{'user.name'},$env{'user.domain'}); 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 { + unless (($found_server eq $env{'form.otherserver'}) && + ($balancer_cookie =~ /^\Q$env{'user.domain'}\E_\Q$env{'user.name'}\E_/)) { $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, - '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; - } elsif ($otherbalcookie) { - $info{'otherbalcookie'} = $otherbalcookie; } if ($env{'form.origurl'}) { $info{'origurl'} = $env{'form.origurl'}; @@ -270,32 +274,44 @@ 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'}; - } elsif ($env{'request.linkkey'} ne '') { - $info{'linkkey'} = $env{'request.linkkey'}; + if ($env{'request.lti.login'}) { + $info{'lti.login'} = $env{'request.lti.login'}; + } + if ($env{'request.lti.uri'}) { + $info{'lti.uri'} = $env{'request.lti.uri'}; + } + if ($env{'request.lti.reqcrs'}) { + $info{'lti.reqcrs'} = $env{'request.lti.reqcrs'}; + } + if ($env{'request.lti.reqrole'}) { + $info{'lti.reqrole'} = $env{'request.lti.reqrole'}; + } + if ($env{'request.lti.selfenrollrole'}) { + $info{'lti.selfenrollrole'} = $env{'request.lti.selfenrollrole'}; + } + if ($env{'request.lti.sourcecrs'}) { + $info{'lti.sourcecrs'} = $env{'request.lti.sourcecrs'}; + } + if ($env{'request.lti.passbackid'}) { + $info{'lti.passbackid'} = $env{'request.lti.passbackid'}; + } + if ($env{'request.lti.passbackurl'}) { + $info{'lti.passbackurl'} = $env{'request.lti.passbackurl'}; + } + if ($env{'request.lti.rosterid'}) { + $info{'lti.rosterid'} = $env{'request.lti.rosterid'}; + } + if ($env{'request.lti.rosterurl'}) { + $info{'lti.rosterurl'} = $env{'request.lti.rosterurl'}; } - if ($env{'request.deeplink.login'}) { - $info{'deeplink.login'} = $env{'request.deeplink.login'}; + if ($env{'request.lti.target'}) { + $info{'lti.target'} = $env{'request.lti.target'}; } my $token = &Apache::lonnet::tmpput(\%info,$env{'form.otherserver'}); my $url =$protocol.'://'.$switch_to.'/adm/login?'. @@ -303,7 +319,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;