--- loncom/auth/switchserver.pm 2023/01/23 01:59:24 1.35.2.6.2.5 +++ loncom/auth/switchserver.pm 2022/09/13 12:22:14 1.63 @@ -1,7 +1,7 @@ # The LearningOnline Network # Switch Servers Handler # -# $Id: switchserver.pm,v 1.35.2.6.2.5 2023/01/23 01:59:24 raeburn Exp $ +# $Id: switchserver.pm,v 1.63 2022/09/13 12:22:14 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -155,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; + } } } } @@ -184,7 +188,12 @@ sub handler { if (exists($env{$rolekey})) { my ($start,$end) = split(/\./,$env{$rolekey}); unless (($start && $start > $now) || ($end && $end < $now)) { - $hasrole = $rolekey; + if ($rolekey eq "user.role.au./$audom/") { + $hasrole = $rolekey; + } elsif ((&Apache::lonnet::will_trust('othcoau',$env{'user.domain'},$audom)) && + (&Apache::lonnet::will_trust('coaurem',$audom,$env{'user.domain'}))) { + $hasrole = $rolekey; + } } if ($hasrole) { $hasrole =~ s/^\Quser.role.\E//; @@ -242,6 +251,10 @@ 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)"; } @@ -269,9 +282,9 @@ sub handler { # ---------------------------------------------------------------- Get handover - my ($is_balancer,$setcookie,$newcookieid,$otherbalcookie); + my ($is_balancer,$setcookie,$newcookieid,$otherbalcookie,$offloadto,$dom_balancers); my $only_body = 0; - ($is_balancer,undef,$setcookie) = + ($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'}) { @@ -291,12 +304,25 @@ sub handler { $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' => $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) { @@ -304,12 +330,6 @@ sub handler { } if ($env{'form.origurl'}) { $info{'origurl'} = $env{'form.origurl'}; - if ($env{'form.origurl'} eq '/adm/email') { - if ($env{'request.display'} && ($env{'request.mailrecip'} eq "$env{'user.name'}:$env{'user.domain'}")) { - $info{'display'} = &escape($env{'request.display'}); - $info{'mailrecip'} = &escape($env{'request.mailrecip'}); - } - } } if ($env{'form.symb'}) { $info{'symb'} = $env{'form.symb'}; @@ -321,7 +341,7 @@ sub handler { if (defined($r->dir_config("lonSSOUserLogoutScriptFile_$info{domain}"))) { if (open(my $fh,'<',$r->dir_config("lonSSOUserLogoutScriptFile_$info{domain}"))) { $ssologoutscript .= join('',<$fh>); - close($fh); + close($fh); } } if (defined($r->dir_config('lonSSOUserLogoutScriptFile'))) { @@ -347,6 +367,39 @@ sub handler { if ($env{'request.deeplink.login'}) { $info{'deeplink.login'} = $env{'request.deeplink.login'}; } + 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 @args = ("domain=$env{'user.domain'}", "username=$env{'user.name'}",