--- loncom/auth/migrateuser.pm 2013/09/29 13:07:25 1.19 +++ loncom/auth/migrateuser.pm 2016/12/05 00:51:43 1.25 @@ -1,7 +1,7 @@ # The LearningOnline Network # Starts a user off based of an existing token. # -# $Id: migrateuser.pm,v 1.19 2013/09/29 13:07:25 raeburn Exp $ +# $Id: migrateuser.pm,v 1.25 2016/12/05 00:51:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,12 +37,15 @@ use Apache::lonlocal; use Apache::lonlogin(); sub goto_login { - my ($r) = @_; + my ($r,$domain) = @_; &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,'/adm/login'],}). + {'redirect' => [0,$url],}). '

'.&mt('One moment please...').'

'. '

'.&mt('Transferring to login page.').'

'. &Apache::loncommon::end_page()); @@ -72,18 +75,26 @@ sub ip_changed { if (ref($dataref) eq 'HASH') { my $title = 'LON-CAPA Session redirected'; my $message = &mt('Your internet address has changed since you logged in.'); - my $camefrom = &Apache::lonnet::hostname($dataref->{'server'}); - my $frombalancer = $dataref->{'balancer'}; my $rule_in_effect; - if ($frombalancer) { - my $balancerdom = &Apache::lonnet::host_domain($dataref->{'server'}); - my ($result,$cached)=&Apache::lonnet::is_cached_new('loadbalancing',$balancerdom); + if ($dataref->{'balancer'}) { + my $baldom = &Apache::lonnet::host_domain($camefrom); + my $balprimaryid = &Apache::lonnet::domain($baldom,'primary'); + my $balintdom = &Apache::lonnet::internet_dom($balprimaryid); + my $uprimaryid = &Apache::lonnet::domain($udom,'primary'); + my $uintdom = &Apache::lonnet::internet_dom($uprimaryid); + my $dom_in_use; + if (($uintdom ne '') && ($uintdom eq $balintdom)) { + $dom_in_use = $udom; + } else { + $dom_in_use = $baldom; + } + my ($result,$cached)=&Apache::lonnet::is_cached_new('loadbalancing',$dom_in_use); unless (defined($cached)) { my $cachetime = 60*60*24; my %domconfig = - &Apache::lonnet::get_dom('configuration',['loadbalancing'],$balancerdom); + &Apache::lonnet::get_dom('configuration',['loadbalancing'],$dom_in_use); if (ref($domconfig{'loadbalancing'}) eq 'HASH') { - $result = &Apache::lonnet::do_cache_new('loadbalancing',$balancerdom, + $result = &Apache::lonnet::do_cache_new('loadbalancing',$dom_in_use, $domconfig{'loadbalancing'},$cachetime); } } @@ -106,47 +117,72 @@ sub ip_changed { my $url; my $lonhost= $r->dir_config('lonHostID'); my $switchto = $lonhost; - if ($rule_in_effect eq 'balancer') { + if ($rule_in_effect ne 'offloadedto') { my $hosthere; - if ($dataref->{'role'}) { - my ($adom,$aname); - if ($dataref->{'role'} =~ m{^au\./($match_domain)/$}) { - $adom = $1; - $aname = $dataref->{'username'}; - } elsif ($dataref->{'role'} =~ m{^(?:ca|aa)\./($match_domain)/($match_username)$}) { - $adom = $1; - $aname = $2; - } - if ($adom ne '' && $aname ne '') { - my $ahome = &Apache::lonnet::homeserver($aname,$adom); - unless ($ahome eq 'no_host') { - my @ids=&Apache::lonnet::current_machine_ids(); - if ($ahome && grep(/^\Q$ahome\E$/,@ids)) { - $hosthere = 1; + my @ids=&Apache::lonnet::current_machine_ids(); + unless ($rule_in_effect eq 'balancer') { + if (grep(/^\Q$rule_in_effect\E$/,@ids)) { + $hosthere = 1; + } + } + unless ($hosthere) { + if ($dataref->{'role'}) { + my ($adom,$aname); + if ($dataref->{'role'} =~ m{^au\./($match_domain)/$}) { + $adom = $1; + $aname = $dataref->{'username'}; + } elsif ($dataref->{'role'} =~ m{^(?:ca|aa)\./($match_domain)/($match_username)$}) { + $adom = $1; + $aname = $2; + } + if ($adom ne '' && $aname ne '') { + my $ahome = &Apache::lonnet::homeserver($aname,$adom); + unless ($ahome eq 'no_host') { + if ($ahome && grep(/^\Q$ahome\E$/,@ids)) { + $hosthere = 1; + } } } } } - unless ($hosthere) { - my $hostname = &Apache::lonnet::hostname($dataref->{'server'}); + unless ($hosthere) { + my $hostname; + if ($rule_in_effect eq 'balancer') { + $hostname = &Apache::lonnet::hostname($dataref->{'server'}); + if ($hostname) { + $switchto = $dataref->{'server'}; + } + } else { + $hostname = &Apache::lonnet::hostname($rule_in_effect); + if ($hostname) { + $switchto = $rule_in_effect; + } + } if ($hostname) { - $switchto = $dataref->{'server'}; my $protocol = $Apache::lonnet::protocol{$switchto}; $protocol = 'http' if ($protocol ne 'https'); $url = $protocol.'://'.$hostname; - $message .= '
'. - &mt('As a result, your LON-CAPA session is being redirected to the server where you originally logged in.'); + if ($rule_in_effect eq 'balancer') { + $message .= '
'. + &mt('As a result, your LON-CAPA session is being redirected to the server where you originally logged in.'); + } else { + $message .= '
'. + &mt('As a result, your LON-CAPA session is being redirected.'); + } } } } if ($dataref->{'sso.login'}) { - $url .= '/adm/roles?'; + $url .= '/adm/roles'; } else { - $url .= '/adm/login?'; - $message .= '
'.&mt('You will need to provide your password one more time'); + $url .= '/adm/login'; + if ($udom) { + $url .= '?domain='.$udom; + } + $message .= '
'.&mt('You will need to provide your password one more time.'); } my %info= ( - 'domain' => $dataref->{'domain'}, + 'domain' => $udom, 'username' => $dataref->{'username'}, 'role' => $dataref->{'role'}, 'sessionserver' => $lonhost, @@ -159,6 +195,7 @@ sub ip_changed { } my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto); unless ($iptoken eq 'conlost') { + $url .= ($url =~ /\?/) ? '&' : '?'; $url .= 'iptoken='.$iptoken; } $r->print(&Apache::loncommon::start_page($title,undef, @@ -193,12 +230,18 @@ sub handler { return &goto_login($r); } if ($data{'ip'} ne $ENV{'REMOTE_ADDR'}) { + &Apache::lonnet::logthis('IP change when session migration requested -- was: '. + $data{'ip'}.'; now: '.$ENV{'REMOTE_ADDR'}.' for '.$data{'username'}.':'.$data{'domain'}); return &ip_changed($r,$data{'domain'},$data{'server'},\%data); } &Apache::lonnet::logthis("Allowing access for $data{'username'}:$data{'domain'} to $data{'role'}"); my $home=&Apache::lonnet::homeserver($data{'username'},$data{'domain'}); - if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r); } + my $udom; + if (&Apache::lonnet::domain($data{'domain'})) { + $udom=$data{'domain'}; + } + if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r,$udom); } my $extra_env = &sso_check(\%data); @@ -206,6 +249,12 @@ sub handler { if ($data{'symb'} ne '') { $form{'symb'} = $data{'symb'}; } + if ($data{'iptoken'} ne '') { + $form{'iptoken'} = $data{'iptoken'}; + } + if ($data{'noloadbalance'} ne '') { + $form{'noloadbalance'} = $data{'noloadbalance'}; + } if (!$data{'role'}) { my $handle = &Apache::lonnet::check_for_valid_session($r);