'.&mt('Transferring to login page.').'
'. + &Apache::loncommon::end_page()); } - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - my $url = '/adm/login'; - if ($domain) { - $url .= '?domain='.$domain; - } - $r->print(&Apache::loncommon::start_page('Going to login',undef, - {'redirect' => [0,$url,'',$write_to_opener],}). - ''.&mt('Transferring to login page.').'
'. - &Apache::loncommon::end_page()); return OK; } @@ -120,8 +116,50 @@ sub lti_check { return \%lti_env; } +sub canhost { + my ($uname,$udom,$lonhost,$loncaparev) = @_; + my $canhost; + if (&Apache::lonnet::is_library($lonhost)) { + my @possdoms = &Apache::lonnet::current_machine_domains(); + my %roleshash = &Apache::lonnet::get_my_roles($uname,$udom,'userroles','',['ca','aa'],\@possdoms); + if (keys(%roleshash)) { + foreach my $key (keys(%roleshash)) { + my $audom = (split(/:/,$key))[1]; + if ((&Apache::lonnet::will_trust('othcoau',$udom,$audom)) && + (&Apache::lonnet::will_trust('coaurem',$audom,$udom))) { + $canhost = 1; + last; + } + } + } + } + unless ($canhost) { + my $uprimary_id = &Apache::lonnet::domain($udom,'primary'); + my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id); + my @intdoms; + my $internet_names = &Apache::lonnet::get_internet_names($lonhost); + if (ref($internet_names) eq 'ARRAY') { + @intdoms = @{$internet_names}; + } + if ($uint_dom ne '' && grep(/^\Q$uint_dom\E$/,@intdoms)) { + $canhost = 1; + } else { + my $hostname = &Apache::lonnet::hostname($lonhost); + my $serverhomeID = &Apache::lonnet::get_server_homeID($hostname); + my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID); + my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom); + my %udomdefaults = &Apache::lonnet::get_domain_defaults($udom); + $canhost = + &Apache::lonnet::can_host_session($udom,$lonhost,$loncaparev, + $udomdefaults{'remotesessions'}, + $defdomdefaults{'hostedsessions'}); + } + } + return $canhost; +} + sub ip_changed { - my ($r,$udom,$camefrom,$dataref) = @_; + my ($r,$udom,$camefrom,$idsref,$dataref) = @_; &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; if (ref($dataref) eq 'HASH') { @@ -170,8 +208,10 @@ sub ip_changed { my $lonhost= $r->dir_config('lonHostID'); my $switchto = $lonhost; if ($rule_in_effect ne 'offloadedto') { - my $hosthere; - my @ids=&Apache::lonnet::current_machine_ids(); + my ($hosthere,@ids); + if (ref($idsref) eq 'ARRAY') { + @ids=@{$idsref}; + } unless ($rule_in_effect eq 'balancer') { if (grep(/^\Q$rule_in_effect\E$/,@ids)) { $hosthere = 1; @@ -243,29 +283,23 @@ sub ip_changed { my %info= ( 'domain' => $udom, 'username' => $dataref->{'username'}, + 'role' => $dataref->{'role'}, 'sessionserver' => $lonhost, ); - my @names = ('origurl','symb','role','linkprotuser','linkprotexit','linkprot','linkkey','linkprotpbid','linkprotpburl'); - foreach my $name (@names) { - if ($dataref->{$name} ne '') { - $info{$name} = $dataref->{$name}; - } + if ($dataref->{'origurl'}) { + $info{'origurl'} = $dataref->{'origurl'}; } - if ($info{'origurl'} eq '/adm/email') { - if (($dataref->{'display'}) && ($dataref->{'mailrecip'})) { - if (&unescape($dataref->{'mailrecip'}) eq $dataref->{'username'}.':'.$dataref->{'domain'}) { - $info{'display'} = $dataref->{'display'}; - $info{'mailrecip'} = $dataref->{'mailrecip'}; - } - } + if ($dataref->{'symb'}) { + $info{'symb'} = $dataref->{'symb'}; } - my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto,'link'); + my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto); unless ($iptoken eq 'conlost') { - $url .= (($url =~ /\?/) ? '&' : '?') . 'iptoken='.$iptoken; + $url .= ($url =~ /\?/) ? '&' : '?'; + $url .= 'iptoken='.$iptoken; } $r->print(&Apache::loncommon::start_page($title,undef, {'redirect' => - [2,$url,'',$dataref->{'lcssowin'}]}). + [2,$url],}). ''.$message.'
'. &Apache::loncommon::end_page()); @@ -276,7 +310,7 @@ sub ip_changed { } sub logout { - my ($r,$ip,$handle,$data,$lti_env,$linkprot_info) = @_; + my ($r,$ip,$handle,$data,$lti_env) = @_; my $lonidsdir=$r->dir_config('lonIDsDir'); if (unlink("$lonidsdir/$handle.id")) { if (($env{'user.linkedenv'} =~ /^[a-f0-9]+_linked$/) && @@ -303,8 +337,15 @@ sub logout { -expires => '-10y',); $r->headers_out->add('Set-cookie' => $c); } + my (%info,%user_info,%lti_info); + if (ref($lti_env) eq 'HASH') { + foreach my $key (sort(keys(%{$lti_env}))) { + if ($key =~ /^request\.(.+)$/) { + $lti_info{$1} = $lti_env->{$key}; + } + } + } my $lonhost = $r->dir_config('lonHostID'); - my ($url,$token,$delay,$write_to_opener,%info,%user_info); if (ref($data) eq 'HASH') { %user_info=('ip' => $ip, 'domain' => $data->{'domain'}, @@ -314,41 +355,14 @@ sub logout { 'origurl' => $data->{'origurl'}, 'symb' => $data->{'symb'}, 'server' => $lonhost); - $write_to_opener = $data->{'lcssowin'}; - } - $delay = 0.1; - if (ref($linkprot_info) eq 'HASH') { - if ($linkprot_info->{'linkprotuser'} ne '') { - $token = &Apache::lonnet::tmpput($linkprot_info,$lonhost); - $url = '/adm/login?ltoken='.$token; - } else { - foreach my $key (keys(%user_info)) { - if ($user_info{$key} eq '') { - delete($user_info{$key}); - } - } - %info = (%user_info,%{$linkprot_info}); - $token = &Apache::lonnet::tmpput(\%info,$lonhost); - $url = '/adm/migrateuser?token='.$token; - } - $delay = 0; - } else { - my %lti_info; - if (ref($lti_env) eq 'HASH') { - foreach my $key (sort(keys(%{$lti_env}))) { - if ($key =~ /^request\.(.+)$/) { - $lti_info{$1} = $lti_env->{$key}; - } - } - } - %info = (%user_info,%lti_info); - $token = &Apache::lonnet::tmpput(\%info,$lonhost); - $url = '/adm/migrateuser?token='.$token; } + %info = (%user_info,%lti_info); + my $token = &Apache::lonnet::tmpput(\%info,$lonhost); + my $url = '/adm/migrateuser?token='.$token; $r->send_http_header; $r->print( &Apache::loncommon::start_page('Updating Session ...',undef, - {'redirect' => [$delay,$url,'',$write_to_opener], + {'redirect' => [0.1,$url], 'only_body' => 1,}). &Apache::loncommon::end_page()); if ($env{'request.balancercookie'}) { @@ -362,6 +376,193 @@ sub logout { return; } +sub conlost_userhome { + my ($r,$idsref,$dataref) = @_; + return unless ((ref($idsref) eq 'ARRAY') && (ref($dataref) eq 'HASH')); + my @ids = @{$idsref}; + my %data = %{$dataref}; + my ($lonhost,$lowest_load,$otherserver,$is_balancer,%conlost,%posstargets); + $lonhost = $r->dir_config('lonHostID'); + if (grep(/^\Q$lonhost\E$/,split(/,/,$data{'dom_balancers'}))) { + $is_balancer = 1; + } + $lowest_load = 30000; + if ($data{'conlost'} ne '') { + map { $conlost{$_} = 1; } split(/,/,$data{'conlost'}); + } + if ($data{'loncfail'}) { + if ($lonhost ne $data{'from_balancer'}) { + my ($is_balancer,$posshost,$setcookie,$offloadto,$dom_balancers) = + &Apache::lonnet::check_loadbalancing($data{'username'},$data{'domain'}); + if ($is_balancer) { + if (ref($offloadto) eq 'HASH') { + $data{'offloadto'} = ''; + foreach my $key (keys(%{$offloadto})) { + if (ref($offloadto->{$key}) eq 'ARRAY') { + $data{'offloadto'} .= $key.'='.join(',',@{$offloadto->{$key}}).'&'; + } + } + $data{'offloadto'} =~ s/\&$//; + } elsif (ref($offloadto) eq 'ARRAY') { + $data{'offloadto'} = join(',',@{$offloadto}); + } + } + } + } else { + $conlost{$lonhost} = 1; + $data{'conlost'} = join(',',sort(keys(%conlost))); + } + if ($data{'offloadto'} =~ /\&/) { + foreach my $item (split(/\&/,$data{'offloadto'})) { + my ($type,$targets) = split(/\=/,$item); + @{$posstargets{$type}} = split(/,/,$targets); + } + } elsif ($data{'offloadto'} =~ /=/) { + my ($type,$targets) = split(/\=/,$data{'offloadto'}); + @{$posstargets{$type}} = split(/,/,$targets); + } else { + @{$posstargets{'default'}} = split(/,/,$data{'offloadto'}); + } + if (ref($posstargets{'primary'}) eq 'ARRAY') { + foreach my $try_server (@{$posstargets{'primary'}}) { + next if ($conlost{$try_server}); + next if ((grep(/^\Q$try_server\E$/,@ids)) && !$data{'loncfail'}); + ($otherserver,$lowest_load) = + &Apache::lonnet::compare_server_load($try_server, + $otherserver, + $lowest_load); + } + } + my $found_server = ($otherserver ne '' && $lowest_load < 100); + if (!$found_server) { + if (ref($posstargets{'default'}) eq 'ARRAY') { + foreach my $try_server (@{$posstargets{'default'}}) { + next if ($conlost{$try_server}); + next if ((grep(/^\Q$try_server\E$/,@ids)) && !$data{'loncfail'}); + ($otherserver,$lowest_load) = + &Apache::lonnet::compare_server_load($try_server, + $otherserver, + $lowest_load); + } + } + } + if ($otherserver ne '') { + my $switchto = &Apache::lonnet::hostname($otherserver); + if ($switchto ne '') { + $data{'server'} = $lonhost; + if ($data{'loncfail'}) { + delete($data{'loncfail'}); + } + if (grep(/^\Q$otherserver\E$/,split(/,/,$data{'dom_balancers'}))) { + $data{'noloadbalance'} = $otherserver; + } + &do_server_switch($r,$otherserver,$switchto,$is_balancer,\%data); + return $otherserver; + } else { + #FIXME Contents of $data{offloadto} contains invalid hostID. + } + } else { + my (%poss_balancers,%tried_balancers); + map { $poss_balancers{$_} = 1; } split(/,/,$data{'dom_balancers'}); + map { $tried_balancers{$_} = 1; } split(/,/,$data{'tried_balancers'}); + if (keys(%poss_balancers)) { + foreach my $try_server (sort(keys(%poss_balancers))) { + next if (grep(/^\Q$try_server\E$/,@ids)); + next if (($data{'loncfail'}) && ($tried_balancers{$try_server})); + my $alreadytried; + foreach my $key (keys(%posstargets)) { + if ((ref($posstargets{$key}) eq 'ARRAY') && + (grep(/^\Q$try_server\E$/,@{$posstargets{$key}}))) { + $alreadytried = 1; + last; + } + } + unless ($alreadytried) { + if (&Apache::lonnet::reply('ping',$try_server) eq $try_server) { + $otherserver = $try_server; + last; + } + } + } + } + if ($otherserver ne '') { + my $switchto = &Apache::lonnet::hostname($otherserver); + if ($switchto ne '') { + $data{'server'} = $lonhost; + $data{'loncfail'} = $lonhost; + $tried_balancers{$otherserver} = 1; + $data{'tried_balancers'} = join(',',sort(keys(%tried_balancers))); + &do_server_switch($r,$otherserver,$switchto,$is_balancer,\%data); + return $otherserver; + } else { + #FIXME Contents of $data{'dom_balancers'} contains invalid hostID. + } + } else { + if ($data{'loncfail'}) { + #FIXME Nowhere to go. + } else { + # FIXME Send back to a balancer (no token); different balancer if this is a balancer. + # Send command to balancer to exclude this host using http instead on lonc/lond + } + } + } + return; +} + +sub do_server_switch { + my ($r,$otherserver,$switchto,$is_balancer,$dataref) = @_; + if (ref($dataref) eq 'HASH') { + my $domain = $dataref->{'domain'}; + my $username = $dataref->{'username'}; + # If this is a balancer set a balancer cookie unless browser already sent + # LON-CAPA load balancer cookie which points at the target server. + if ($is_balancer) { + my $newcookieid; + my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r,1); + unless (($found_server eq $otherserver) && + ($balancer_cookie =~ /^\Q$domain\E_\Q$username\E_/)) { + $newcookieid = + &Apache::switchserver::balancer_cookieid($r,$otherserver,$username,$domain); + if ($newcookieid) { + $dataref->{'balcookie'} = $newcookieid; + } + } + } + my $token = &Apache::lonnet::tmpput($dataref,$otherserver); + my $protocol = $Apache::lonnet::protocol{$otherserver}; + $protocol = 'http' if ($protocol ne 'https'); + my $url = $protocol.'://'.$switchto.'/adm/login?domain='.$domain. + '&username='.$username.'&token='.$token; + $r->send_http_header; + $r->print( + &Apache::loncommon::start_page('Switching Server ...',undef, + {'redirect' => [0.1,$url]}). + &Apache::loncommon::end_page()); + } + return; +} + +sub log_switch { + my ($r,$data,$lti_env,$ip) = @_; + my $lonhost = $r->dir_config('lonHostID'); + return unless ((ref($data) eq 'HASH') && (ref($lti_env) eq 'HASH')); + my $now = time; + my %temp=('switchserver' => $now.':'.$lonhost,$data->{'role'}); + &Apache::lonnet::put('email_status',\%temp); + my $logmsg = "Switch Server to $lonhost"; + if ($data->{'role'}) { + $logmsg .= " with role: ".$data->{'role'}; + } elsif (($lti_env->{'reqcrs'}) && ($lti_env->{'reqrole'} eq 'cc')) { + $logmsg .= " to create new LTI course"; + } elsif ($lti_env->{'selfenrollrole'}) { + $logmsg .= " to selfenroll with role: ".$lti_env->{'selfenrollrole'}; + } else { + $logmsg .= " (no role)"; + } + $logmsg .= ' '.$ip; + &Apache::lonnet::log($data->{'domain'},$data->{'username'},$data->{'home'},$logmsg); +} + sub flush_course_logs { &Apache::lonnet::flushcourselogs(); return OK; @@ -369,7 +570,7 @@ sub flush_course_logs { sub handler { my ($r) = @_; - + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']); my %data = &Apache::lonnet::tmpget($env{'form.token'}); if (keys(%data) == 0) { @@ -380,25 +581,62 @@ sub handler { &Apache::lonlocal::get_language_handle($r); if ($delete ne 'ok') { - return &goto_login($r,'',\%data); + return &goto_login($r,undef,\%data); } if (!defined($data{'username'}) || !defined($data{'domain'})) { - return &goto_login($r,'',\%data); + return &goto_login($r,undef,\%data); } + my ($home,@ids); + @ids=&Apache::lonnet::current_machine_ids(); my $ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP); if ($data{'ip'} ne $ip) { &Apache::lonnet::logthis('IP change when session migration requested -- was: '. $data{'ip'}.'; now: '.$ip.' for '.$data{'username'}.':'.$data{'domain'}); - return &ip_changed($r,$data{'domain'},$data{'server'},\%data); + return &ip_changed($r,$data{'domain'},$data{'server'},\@ids,\%data); + } + if ($data{'loncfail'}) { + &Apache::lonnet::logthis('Returned from '.$data{'server'}.' -- no connection to library node or other access node(s)'); + my $otherserver = &conlost_userhome($r,\@ids,\%data); + if ($otherserver ne '') { + &Apache::lonnet::logthis("Switching to $otherserver"); + } + return OK; + } else { + $home=&Apache::lonnet::homeserver($data{'username'},$data{'domain'}); + if ($home eq 'no_host') { + if (($data{'home'} ne '') && (&Apache::lonnet::hostname($data{'home'}))) { + &Apache::lonnet::reconlonc($data{'home'}); + $home=&Apache::lonnet::homeserver($data{'username'},$data{'domain'}); + if ($home eq 'no_host') { + unless (grep(/^\Q$data{'home'}\E$/,@ids)) { + if (&Apache::lonnet::reply('ping',$data{'home'}) eq 'con_lost') { + my $otherserver = &conlost_userhome($r,\@ids,\%data); + if ($otherserver ne '') { + &Apache::lonnet::logthis("No connection to home server ($data{'home'}) for $data{'username'}:$data{'domain'}. Switching to $otherserver"); + } + return OK; + } + } + } + } + } } - my $home=&Apache::lonnet::homeserver($data{'username'},$data{'domain'}); my $udom; if (&Apache::lonnet::domain($data{'domain'})) { $udom=$data{'domain'}; } - if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r,$udom,\%data); } + if ($home eq 'no_host') { return &goto_login($r,$udom,\%data); } + if (&Apache::lonnet::hostname($home) eq '') { return &goto_login($r,$udom,\%data); } + + unless (grep(/^\Q$home\E$/,@ids)) { + my $lonhost = $r->dir_config('lonHostID'); + my $loncaparev = $r->dir_config('lonVersion'); + unless (&canhost($data{'username'},$data{'domain'},$lonhost,$loncaparev)) { + return &goto_login($r,$udom,\%data); + } + } my $rolemsg; if ($data{'role'}) { @@ -418,7 +656,6 @@ sub handler { } elsif ((ref($lti_env) eq 'HASH') && (keys(%{$lti_env}))) { $extra_env = $lti_env; } - if (($data{'balancer'}) && ($data{'server'}) && ($data{'balcookie'})) { if (ref($extra_env) eq 'HASH') { $extra_env->{'request.balancercookie'} = $data{'server'}.':'.$data{'balcookie'}; @@ -441,6 +678,16 @@ sub handler { } } + if (($data{'conlost'}) && ($data{'server'})) { + my @conlosts = split(/,/,$data{'conlost'}); + my $switchfrom = $data{'server'}; + if (@conlosts) { + if (grep(/^\Q$switchfrom\E$/,@conlosts)) { + &log_switch($r,\%data,$extra_env,$ip); + } + } + } + my (%form,$cid); if ($data{'symb'} ne '') { $form{'symb'} = $data{'symb'}; @@ -458,63 +705,11 @@ sub handler { } } } else { - my ($handle,$expirepub); - $handle = &Apache::lonnet::check_for_valid_session($r); - -# For "public user" - remove any existing "public" cookie so actual user is logged in. - if ($handle) { - if ($handle=~/^publicuser\_/) { - my $lonidsdir=$r->dir_config('lonIDsDir'); - if ($lonidsdir ne '') { - unlink("$lonidsdir/$handle.id"); - } - undef($handle); - $expirepub = 1; - } - } + my $handle = &Apache::lonnet::check_for_valid_session($r); if ($handle) { &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'), $handle); - my $checklaunch; - if ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) { - unless ($env{'request.linkprot'} eq $data{'linkprot'}) { - $checklaunch = 1; - } - unless ($env{'request.linkprotexit'} eq $data{'linkprotexit'}) { - $checklaunch = 1; - } - unless ($env{'request.linkprotpbid'} eq $data{'linkprotpbid'}) { - $checklaunch = 1; - } - unless ($env{'request.linkprotpburl'} eq $data{'linkprotpburl'}) { - $checklaunch = 1; - } - unless ($env{'request.linkkey'} eq $data{'linkkey'}) { - $checklaunch = 1; - } - unless ($env{'request.deeplink.login'} eq $data{'deeplink.login'}) { - $checklaunch = 1; - } - } if ($data{'linkprot'} ne '') { - if (($env{'user.name'} ne $data{'username'}) || - ($env{'user.domain'} ne $data{'domain'})) { - my %linkprot_env; - foreach my $item ('linkprot','linkprotexit','linkprotpbid','linkprotpburl','deeplink.login') { - if ($data{$item}) { - $linkprot_env{$item} = $data{$item}; - } - } - &logout($r,$ip,$handle,\%data,undef,\%linkprot_env); - return OK; - } - &Apache::lonnet::appenv({'request.linkprot' => $data{'linkprot'}}); - if ($data{'linkprotexit'}) { - &Apache::lonnet::appenv({'request.linkprotexit' => $data{'linkprotexit'}}); - } - if ($env{'request.linkkey'}) { - &Apache::lonnet::delenv('request.linkkey'); - } my ($linkprotector,$deeplink) = split(/:/,$data{'linkprot'},2); if ($env{'user.linkprotector'}) { my @protectors = split(/,/,$env{'user.linkprotector'}); @@ -536,14 +731,10 @@ sub handler { } else { &Apache::lonnet::appenv({'user.linkproturi' => $deeplink}); } - } elsif ($data{'linkkey'} ne '') { - &Apache::lonnet::appenv({'request.linkkey' => $data{'linkkey'}}); - if ($env{'request.linkprot'}) { - &Apache::lonnet::delenv('request.linkprot'); - } + } elsif ($data{'linkkey'}) { my $deeplink = $data{'deeplink.login'}; my $linkkey = $data{'linkkey'}; - if ($env{'user.deeplinkkey'} ne '') { + if ($env{'user.deeplinkkey'}) { my @linkkeys = split(/,/,$env{'user.deeplinkkey'}); unless (grep(/^\Q$linkkey\E$/,@linkkeys)) { push(@linkkeys,$linkkey); @@ -552,7 +743,7 @@ sub handler { } else { &Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey}); } - if ($deeplink) { + if ($deeplink) { if ($env{'user.keyedlinkuri'}) { my @keyeduris = split(/,/,$env{'user.keyedlinkuri'}); unless (grep(/^\Q$deeplink\E$/,@keyeduris)) { @@ -566,14 +757,8 @@ sub handler { } if ($data{'deeplink.login'}) { &Apache::lonnet::appenv({'request.deeplink.login' => $data{'deeplink.login'}}); - if ($env{'environment.remote'} eq 'on') { - &Apache::lonnet::appenv({'environment.remote' => 'off'}); - } } if ($data{'lti.login'}) { - if ($env{'environment.remote'} eq 'on') { - &Apache::lonnet::appenv({'environment.remote' => 'off'}); - } my $needslogout; if ($env{'request.lti.login'}) { if (($env{'user.name'} ne $data{'username'}) || @@ -583,7 +768,7 @@ sub handler { } else { $needslogout = 1; } -# If access is via LTI, and user already has a non-LTI session cookie +# If access is via LTI, and user already has a non-LTI session cookie # (and session) or has an LTI session cookie for a different username, # logout the existing session, and start a new one if ($needslogout) { @@ -650,31 +835,7 @@ sub handler { } } } elsif ($data{'origurl'} ne '') { - my $dest = $data{'origurl'}; - if (($env{'request.deeplink.login'} eq $data{'origurl'}) && - (($env{'request.linkprot'}) || ($env{'request.linkkey'} ne ''))) { - my %info; - if ($env{'request.linkprot'}) { - $info{'linkprot'} = $env{'request.linkprot'}; - foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') { - if ($data{$item}) { - $info{$item} = $data{$item}; - } - } - } elsif ($env{'request.linkkey'} ne '') { - $info{'linkkey'} = $env{'request.linkkey'}; - } - $info{'origurl'} = $data{'origurl'}; - if ($checklaunch) { - $info{'checklaunch'} = 1; - } - my $token = &Apache::lonnet::tmpput(\%info,$r->dir_config('lonHostID'),'link'); - unless (($token eq 'con_lost') || ($token eq 'refused') || ($token =~ /^error:/) || - ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) { - $dest .= (($dest =~ /\?/) ? '&' : '?') . 'ttoken='.$token; - } - } - $r->internal_redirect($dest); + $r->internal_redirect($data{'origurl'}); } elsif ($env{'request.course.id'}) { $r->internal_redirect('/adm/navmaps'); } else { @@ -682,7 +843,7 @@ sub handler { } } else { my $desturl = '/adm/roles'; - if ($data{'lti.login'}) { + if ($data{'lti.login'}) { if ($data{'lti.selfenrollrole'}) { $desturl .= '?selectrole=1&'. &escape($data{'lti.selfenrollrole'}).'=1'; @@ -690,10 +851,10 @@ sub handler { $desturl .= '&orgurl='.$data{'origurl'}; if ($data{'origurl'} =~ m{/default_\d+\.sequence$}) { $desturl .= '&navmap=1'; - } + } } } elsif ($data{'origurl'} ne '') { - $desturl = $data{'origurl'}; + $desturl = $data{'origurl'}; if ($desturl =~ m{/default_\d+\.sequence$}) { $desturl .= (($desturl =~/\?/)?'&':'?').'navmap=1'; } @@ -706,52 +867,27 @@ sub handler { if (ref($extra_env) eq 'HASH') { $extra_env->{'user.linkprotector'} = $linkprotector; $extra_env->{'user.linkproturi'} = $linkuri; - $extra_env->{'request.linkprot'} = $data{'linkprot'}; } else { $extra_env = {'user.linkprotector' => $linkprotector, - 'user.linkproturi' => $linkuri, - 'request.linkprot' => $data{'linkprot'}}; - } - if ($data{'linkprotexit'}) { - $extra_env->{'request.linkprotexit'} = $data{'linkprotexit'}; - } - if ($data{'linkprotpbid'}) { - $extra_env->{'request.linkprotpbid'} = $data{'linkprotpbid'}; - } - if ($data{'linkprotpburl'}) { - $extra_env->{'request.linkprotpburl'} = $data{'linkprotpburl'}; + 'user.linkproturi' => $linkuri,}; } } - foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') { - if ($data{$item} ne '') { - $form{$item} = $data{$item}; + } elsif ($data{'deeplink.login'}) { + if ($data{'linkkey'}) { + if (ref($extra_env) eq 'HASH') { + $extra_env->{'user.deeplinkkey'} = $data{'linkkey'}; + $extra_env->{'user.keyedlinkuri'} = $data{'deeplink.login'}, + } else { + $extra_env = {'user.deeplinkkey' => $data{'linkkey'}, + 'user.keyedlinkuri' => $data{'deeplink.login'}}; } } - } elsif ($data{'linkkey'} ne '') { if (ref($extra_env) eq 'HASH') { - $extra_env->{'user.deeplinkkey'} = $data{'linkkey'}; - $extra_env->{'user.keyedlinkuri'} = $data{'deeplink.login'}; - $extra_env->{'request.linkkey'} = $data{'linkkey'}; - } else { - $extra_env = {'user.deeplinkkey' => $data{'linkkey'}, - 'user.keyedlinkuri' => $data{'deeplink.login'}, - 'request.linkkey' => $data{'linkkey'}}; - } - } - if ($data{'deeplink.login'}) { - if (ref($extra_env) eq 'HASH') { - $extra_env->{'request.deeplink.login'} = $data{'deeplink.login'}; + $extra_env->{'request.deeplink.login' => $data{'deeplink.login'}}; } else { $extra_env = {'request.deeplink.login' => $data{'deeplink.login'}}; } } - if ($desturl eq '/adm/email') { - if (($data{'display'}) && ($data{'mailrecip'})) { - if (&unescape($data{'mailrecip'}) eq "$data{'username'}:$data{'domain'}") { - $form{'display'} = &unescape($data{'display'}); - } - } - } } my $skipcritical; if ($data{'lti.login'}) { @@ -762,8 +898,7 @@ sub handler { } } &Apache::lonauth::success($r,$data{'username'},$data{'domain'}, - $home,$desturl,$extra_env,\%form,$skipcritical,'', - $expirepub,$data{'lcssowin'}); + $home,$desturl,$extra_env,\%form,$skipcritical); } return OK; } @@ -795,62 +930,23 @@ sub handler { ($env{'request.role'} eq $data{'role'}) && ($data{'origurl'} ne '')) { $next_url = $data{'origurl'}; $reuse_session = 1; - } elsif ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) { - $next_url=$data{'origurl'}; } else { - if ($data{'lti.login'}) { - $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; - if ($data{'origurl'} ne '') { - $next_url .= '&orgurl='.&escape($data{'origurl'}); - } - } else { - $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; - if ($data{'origurl'} ne '') { - $next_url .= '&orgurl='.&escape($data{'origurl'}); - } + $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; + if ($data{'origurl'} ne '') { + $next_url .= '&orgurl='.&escape($data{'origurl'}); } } if ($data{'lti.login'}) { if (($data{'origurl'} =~ m{/default_\d+\.sequence$}) || ($data{'origurl'} =~ m{^/res/.+\.sequence$})) { - if ($reuse_session) { - $next_url .= '&navmap=1'; - } else { - $next_url .= '&navmap=1'; - } + $next_url .= '&navmap=1'; } } if ($reuse_session) { $r->internal_redirect($next_url); } else { - if ($data{'deeplink.login'}) { - if (ref($extra_env) eq 'HASH') { - $extra_env->{'request.deeplink.login'} = $data{'deeplink.login'}; - } else { - $extra_env = {'request.deeplink.login' => $data{'deeplink.login'}}; - } - if ($data{'linkprot'}) { - $extra_env->{'request.linkprot'} = $data{'linkprot'}; - if ($data{'linkprotexit'}) { - $extra_env->{'request.linkprotexit'} = $data{'linkprotexit'}; - } - if ($data{'linkprotpbid'}) { - $extra_env->{'request.linkprotpassbid'} = $data{'linkprotpbid'}; - } - if ($data{'linkprotpburl'}) { - $extra_env->{'request.linkprotpassburl'} = $data{'linkprotpburl'}; - } - foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') { - if ($data{$item}) { - $form{'request.'.$item} = $data{$item}; - } - } - } elsif ($data{'linkkey'} ne '') { - $extra_env->{'request.linkkey'} = $data{'linkkey'}; - } - } &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home, - $next_url,$extra_env,\%form,'',$cid,'',$data{'lcssowin'}); + $next_url,$extra_env,\%form,'',$cid); } return OK; }