'.&mt('Transferring to login page.').'
'. &Apache::loncommon::end_page()); @@ -192,19 +197,27 @@ sub ip_changed { 'username' => $dataref->{'username'}, 'sessionserver' => $lonhost, ); - my @names = ('origurl','symb','role','linkprot','linkkey'); + my @names = ('origurl','symb','role','linkprotuser','linkprotexit','linkprot','linkkey'); foreach my $name (@names) { if ($dataref->{$name} ne '') { $info{$name} = $dataref->{$name}; } } + 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'}; + } + } + } my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto,'link'); unless ($iptoken eq 'conlost') { $url .= (($url =~ /\?/) ? '&' : '?') . 'iptoken='.$iptoken; } $r->print(&Apache::loncommon::start_page($title,undef, {'redirect' => - [2,$url],}). + [2,$url,'',$dataref->{'lcssowin'}]}). ''.$message.'
'. &Apache::loncommon::end_page()); @@ -214,6 +227,98 @@ sub ip_changed { return OK; } +sub logout { + my ($r,$ip,$handle,$data,$lti_env,$linkprot_info) = @_; + my $lonidsdir=$r->dir_config('lonIDsDir'); + if (unlink("$lonidsdir/$handle.id")) { + if (($env{'user.linkedenv'} =~ /^[a-f0-9]+_linked$/) && + (-l "$lonidsdir/$env{'user.linkedenv'}.id") && + (readlink("$lonidsdir/$env{'user.linkedenv'}.id") eq "$lonidsdir/$handle.id")) { + unlink("$lonidsdir/$env{'user.linkedenv'}.id"); + } + } + my %temp=('logout' => time); + &Apache::lonnet::put('email_status',\%temp); + &Apache::lonnet::log($env{'user.domain'}, + $env{'user.name'}, + $env{'user.home'}, + "Logout $ip"); + + &Apache::loncommon::content_type($r,'text/html'); + + #expire the cookies + my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); + foreach my $name (keys(%cookies)) { + next unless ($name =~ /^lon(|S|Link|Pub)ID$/); + my $c = new CGI::Cookie(-name => $name, + -value => '', + -expires => '-10y',); + $r->headers_out->add('Set-cookie' => $c); + } + 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'}, + 'username' => $data->{'username'}, + 'home' => $data->{'home'}, + 'role' => $data->{'role'}, + '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; + } + $r->send_http_header; + $r->print( + &Apache::loncommon::start_page('Updating Session ...',undef, + {'redirect' => [$delay,$url,'',$write_to_opener], + 'only_body' => 1,}). + &Apache::loncommon::end_page()); + if ($env{'request.balancercookie'}) { + my ($balancer,$cookie) = split(/:/,$env{'request.balancercookie'}); + if ((&Apache::lonnet::hostname($balancer)) && ($cookie =~ /^[a-f0-9]{32}$/)) { + $cookie = $env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cookie; + &Apache::lonnet::delbalcookie($cookie,$balancer); + } + } + $r->register_cleanup(\&flush_course_logs); + return; +} + +sub flush_course_logs { + &Apache::lonnet::flushcourselogs(); + return OK; +} + sub handler { my ($r) = @_; @@ -227,11 +332,11 @@ sub handler { &Apache::lonlocal::get_language_handle($r); if ($delete ne 'ok') { - return &goto_login($r); + return &goto_login($r,'',\%data); } if (!defined($data{'username'}) || !defined($data{'domain'})) { - return &goto_login($r); + return &goto_login($r,'',\%data); } my $ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP); if ($data{'ip'} ne $ip) { @@ -246,7 +351,7 @@ sub handler { if (&Apache::lonnet::domain($data{'domain'})) { $udom=$data{'domain'}; } - if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r,$udom); } + if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r,$udom,\%data); } my $extra_env = &sso_check(\%data); if (($data{'balancer'}) && ($data{'server'}) && ($data{'balcookie'})) { @@ -307,24 +412,35 @@ sub handler { $handle); my $checklaunch; if ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) { - if ($env{'request.linkprot'} ne '') { - unless ($env{'request.linkprot'} eq $data{'linkprot'}) { - $checklaunch = 1; - } - } - if ($env{'request.linkkey'} ne '') { - unless ($env{'request.linkkey'} eq $data{'linkkey'}) { - $checklaunch = 1; - } + unless ($env{'request.linkprot'} eq $data{'linkprot'}) { + $checklaunch = 1; } - if ($env{'request.deeplink.login'}) { - unless ($env{'request.deeplink.login'} eq $data{'deeplink.login'}) { - $checklaunch = 1; - } + unless ($env{'request.linkprotexit'} eq $data{'linkprotexit'}) { + $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','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'); } @@ -379,6 +495,9 @@ 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{'origurl'} ne '') { my $dest = $data{'origurl'}; @@ -387,6 +506,11 @@ sub handler { my %info; if ($env{'request.linkprot'}) { $info{'linkprot'} = $env{'request.linkprot'}; + foreach my $item ('linkprotuser','linkprotexit') { + if ($data{$item}) { + $info{$item} = $data{$item}; + } + } } elsif ($env{'request.linkkey'} ne '') { $info{'linkkey'} = $env{'request.linkkey'}; } @@ -395,7 +519,7 @@ sub handler { $info{'checklaunch'} = 1; } my $token = &Apache::lonnet::tmpput(\%info,$r->dir_config('lonHostID'),'link'); - unless (($token eq 'con_lost') || ($token eq 'refused') || + unless (($token eq 'con_lost') || ($token eq 'refused') || ($token =~ /^error:/) || ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) { $dest .= (($dest =~ /\?/) ? '&' : '?') . 'ttoken='.$token; } @@ -422,6 +546,14 @@ sub handler { 'user.linkproturi' => $linkuri, 'request.linkprot' => $data{'linkprot'}}; } + if ($data{'linkprotexit'}) { + $extra_env->{'request.linkprotexit'} = $data{'linkprotexit'}; + } + } + foreach my $item ('linkprotuser','linkprotexit') { + if ($data{$item} ne '') { + $form{$item} = $data{$item}; + } } } elsif ($data{'linkkey'}) { if (ref($extra_env) eq 'HASH') { @@ -441,10 +573,17 @@ sub handler { $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'}); + } + } + } } &Apache::lonauth::success($r,$data{'username'},$data{'domain'}, $home,$desturl,$extra_env,\%form,'', - $expirepub); + $expirepub,$data{'lcssowin'}); } return OK; } @@ -461,12 +600,20 @@ sub handler { } if ($data{'linkprot'}) { $extra_env->{'request.linkprot'} = $data{'linkprot'}; + if ($data{'linkprotexit'}) { + $extra_env->{'request.linkprotexit'} = $data{'linkprotexit'}; + } + foreach my $item ('linkprotuser','linkprotexit') { + 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); + $next_url,$extra_env,\%form,$cid,'',$data{'lcssowin'}); return OK; }