--- loncom/auth/switchserver.pm 2019/08/03 23:27:39 1.35.2.2
+++ loncom/auth/switchserver.pm 2021/05/04 18:47:37 1.55
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Switch Servers Handler
#
-# $Id: switchserver.pm,v 1.35.2.2 2019/08/03 23:27:39 raeburn Exp $
+# $Id: switchserver.pm,v 1.55 2021/05/04 18:47:37 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();
@@ -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,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'
@@ -151,8 +155,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',$env{'user.domain'},$audom)) &&
+ (&Apache::lonnet::will_trust('coaurem',$audom,$env{'user.domain'}))) {
+ $skip_canhost_check = 1;
+ }
}
}
}
@@ -200,10 +208,15 @@ 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)";
}
- $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);
@@ -223,14 +236,15 @@ sub handler {
return OK;
}
# -------------------------------------------------------- Menu script and info
-
+
# ---------------------------------------------------------------- Get handover
- my $newcookieid;
+ my ($is_balancer,$setcookie,$newcookieid,$otherbalcookie,$offloadto,$dom_balancers);
my $only_body = 0;
- my ($is_balancer,$posshost,$setcookie) =
- &Apache::lonnet::check_loadbalancing($env{'user.name'},$env{'user.domain'});
+ ($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);
@@ -243,15 +257,33 @@ sub handler {
$env{'user.name'},$env{'user.domain'});
}
}
+ if ((!$is_balancer) && ($env{'request.balancercookie'})) {
+ $otherbalcookie = $env{'request.balancercookie'};
+ }
- 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' => $ip,
+ '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'};
@@ -265,6 +297,48 @@ 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'};
+ }
+ 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.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?'.
'domain='.$env{'user.domain'}.