--- loncom/auth/lonlogin.pm 2018/07/04 16:58:19 1.173 +++ loncom/auth/lonlogin.pm 2019/01/27 16:02:43 1.179 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.173 2018/07/04 16:58:19 raeburn Exp $ +# $Id: lonlogin.pm,v 1.179 2019/01/27 16:02:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,7 +37,7 @@ use Apache::lonauth(); use Apache::lonlocal; use Apache::migrateuser(); use lib '/home/httpd/lib/perl/'; -use LONCAPA; +use LONCAPA qw(:DEFAULT :match); use CGI::Cookie(); sub handler { @@ -47,7 +47,7 @@ sub handler { (join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'}, $ENV{'REDIRECT_QUERY_STRING'}), ['interface','username','domain','firsturl','localpath','localres', - 'token','role','symb','iptoken']); + 'token','role','symb','iptoken','btoken','ltoken','linkkey']); if (!defined($env{'form.firsturl'})) { &Apache::lonacc::get_posted_cgi($r,['firsturl']); } @@ -56,6 +56,10 @@ sub handler { $env{'form.firsturl'} = $ENV{'REDIRECT_URL'}; } } + if (($env{'form.firsturl'} =~ m{^/+tiny/+$LONCAPA::match_domain/+\w+$}) && + (!$env{'form.ltoken'}) && (!$env{'form.linkkey'})) { + &Apache::lonacc::get_posted_cgi($r,['linkkey']); + } # -- check if they are a migrating user if (defined($env{'form.token'})) { @@ -64,10 +68,10 @@ sub handler { # For "public user" - remove any exising "public" cookie, as user really wants to log-in my ($handle,$lonidsdir,$expirepub,$userdom); + $lonidsdir=$r->dir_config('lonIDsDir'); unless ($r->header_only) { $handle = &Apache::lonnet::check_for_valid_session($r,'lonID',undef,\$userdom); if ($handle ne '') { - $lonidsdir=$r->dir_config('lonIDsDir'); if ($handle=~/^publicuser\_/) { unlink($r->dir_config('lonIDsDir')."/$handle.id"); undef($handle); @@ -106,6 +110,69 @@ sub handler { return OK; } + my $lonhost = $r->dir_config('lonHostID'); + $env{'form.firsturl'} =~ s/(`)/'/g; + +# Check if browser sent a LON-CAPA load balancer cookie (and this is a balancer) + + my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r,1); + if ($found_server) { + my $hostname = &Apache::lonnet::hostname($found_server); + if ($hostname ne '') { + my $protocol = $Apache::lonnet::protocol{$found_server}; + $protocol = 'http' if ($protocol ne 'https'); + my $dest = '/adm/roles'; + if ($env{'form.firsturl'} ne '') { + $dest = $env{'form.firsturl'}; + } + my %info = ( + balcookie => $lonhost.':'.$balancer_cookie, + ); + if ($env{'form.ltoken'}) { + my %link_info = &Apache::lonnet::tmpget($env{'form.ltoken'}); + if ($link_info{'linkprot'}) { + $info{'linkprot'} = $link_info{'linkprot'}; + } + &Apache::lonnet::tmpdel($env{'form.ltoken'}); + delete($env{'form.ltoken'}); + } elsif ($env{'form.linkkey'}) { + $info{'linkkey'} = $env{'form.linkkey'}; + delete($env{'form.linkkey'}); + } + my $balancer_token = &Apache::lonnet::tmpput(\%info,$found_server); + if ($balancer_token) { + $dest .= (($dest=~/\?/)?'&;':'?') . 'btoken='.$balancer_token; + } + my $url = $protocol.'://'.$hostname.$dest; + my $start_page = + &Apache::loncommon::start_page('Switching Server ...',undef, + {'redirect' => [0,$url],}); + my $end_page = &Apache::loncommon::end_page(); + $r->print($start_page.$end_page); + return OK; + } + } + +# +# Check if a LON-CAPA load balancer sent user here because user's browser sent +# it a balancer cookie for an active session on this server. +# + + my ($balcookie,$linkprot,$linkkey); + if ($env{'form.btoken'}) { + my %info = &Apache::lonnet::tmpget($env{'form.btoken'}); + $balcookie = $info{'balcookie'}; + if ($balcookie) { + if ($info{'linkprot'}) { + $linkprot = $info{'linkprot'}; + } elsif ($info{'linkkey'}) { + $linkkey = $info{'linkkey'}; + } + } + &Apache::lonnet::tmpdel($env{'form.btoken'}); + delete($env{'form.btoken'}); + } + # # If browser sent an old cookie for which the session file had been removed # check if configuration for user's domain has a portal URL set. If so @@ -123,8 +190,6 @@ sub handler { } } - $env{'form.firsturl'} =~ s/(`)/'/g; - # -------------------------------- Prevent users from attempting to login twice if ($handle ne '') { &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); @@ -134,7 +199,63 @@ sub handler { &Apache::loncommon::end_page(); my $dest = '/adm/roles'; if ($env{'form.firsturl'} ne '') { - $dest = $env{'form.firsturl'}; + $dest = $env{'form.firsturl'}; + } + if (($env{'form.ltoken'}) || ($linkprot)) { + unless ($linkprot) { + my %info = &Apache::lonnet::tmpget($env{'form.ltoken'}); + $linkprot = $info{'linkprot'}; + my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'}); + delete($env{'form.ltoken'}); + } + if ($linkprot) { + my ($linkprotector,$deeplink) = split(/:/,$linkprot,2); + if ($env{'user.linkprotector'}) { + my @protectors = split(/,/,$env{'user.linkprotector'}); + unless (grep(/^\Q$linkprotector\E$/,@protectors)) { + push(@protectors,$linkprotector); + @protectors = sort { $a <=> $b } @protectors; + &Apache::lonnet::appenv({'user.linkprotector' => join(',',@protectors)}); + } + } else { + &Apache::lonnet::appenv({'user.linkprotector' => $linkprotector }); + } + if ($env{'user.linkproturi'}) { + my @proturis = split(/,/,$env{'user.linkproturi'}); + unless (grep(/^\Q$deeplink\E$/,@proturis)) { + push(@proturis,$deeplink); + @proturis = sort @proturis; + &Apache::lonnet::appenv({'user.linkproturi' => join(',',@proturis)}); + } + } else { + &Apache::lonnet::appenv({'user.linkproturi' => $deeplink}); + } + } + } elsif (($env{'form.linkkey'}) || ($linkkey)) { + if ($env{'form.firsturl'} =~ m{^/tiny/$match_domain/\w+$}) { + if ($linkkey eq '') { + $linkkey = $env{'form.linkkey'}; + } + if ($env{'user.deeplinkkey'}) { + my @linkkeys = split(/,/,$env{'user.deeplinkkey'}); + unless (grep(/^\Q$linkkey\E$/,@linkkeys)) { + push(@linkkeys,$linkkey); + &Apache::lonnet::appenv({'user.deeplinkkey' => join(',',sort(@linkkeys))}); + } + } else { + &Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey}); + } + my $deeplink = $env{'form.firsturl'}; + if ($env{'user.keyedlinkuri'}) { + my @keyeduris = split(/,/,$env{'user.keyedlinkuri'}); + unless (grep(/^\Q$deeplink\E$/,@keyeduris)) { + push(@keyeduris,$deeplink); + &Apache::lonnet::appenv({'user.keyedlinkuri' => join(',',sort(@keyeduris))}); + } + } else { + &Apache::lonnet::appenv({'user.keyedlinkuri' => $deeplink}); + } + } } $r->print( $start_page @@ -172,12 +293,11 @@ sub handler { my $iconpath= &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); - my $lonhost = $r->dir_config('lonHostID'); my $domain = &Apache::lonnet::default_login_domain(); my $defdom = $domain; if ($lonhost ne '') { unless ($sessiondata{'sessionserver'}) { - my $redirect = &check_loginvia($domain,$lonhost); + my $redirect = &check_loginvia($domain,$lonhost,$lonidsdir,$balcookie,$linkprot); if ($redirect) { $r->print($redirect); return OK; @@ -186,7 +306,7 @@ sub handler { } if (($sessiondata{'domain'}) && - (&Apache::lonnet::domain($env{'form.domain'},'description'))) { + (&Apache::lonnet::domain($sessiondata{'domain'},'description'))) { $domain=$sessiondata{'domain'}; } elsif (($env{'form.domain'}) && (&Apache::lonnet::domain($env{'form.domain'},'description'))) { @@ -277,6 +397,22 @@ sub handler { } $tokenextras .= '&iptoken='.&escape($env{'form.iptoken'}); } + if ($env{'form.ltoken'}) { + my %info = &Apache::lonnet::tmpget($env{'form.ltoken'}); + &Apache::lonnet::tmpdel($env{'form.ltoken'}); + delete($env{'form.ltoken'}); + if ($info{'linkprot'}) { + if (!$tokenextras) { + $tokenextras = '&&&'; + } + $tokenextras .= '&linkprot='.&escape($info{'linkprot'}); + } + } elsif ($env{'form.linkkey'}) { + if (!$tokenextras) { + $tokenextras = '&&&'; + } + $tokenextras .= '&linkkey='.&escape($env{'form.linkkey'}); + } my $logtoken=Apache::lonnet::reply( 'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras, $lonhost); @@ -685,8 +821,8 @@ ENDDOCUMENT } sub check_loginvia { - my ($domain,$lonhost) = @_; - if ($domain eq '' || $lonhost eq '') { + my ($domain,$lonhost,$lonidsdir,$balcookie,$linkprot) = @_; + if ($domain eq '' || $lonhost eq '' || $lonidsdir eq '') { return; } my %domconfhash = &Apache::loncommon::get_domainconf($domain); @@ -715,7 +851,37 @@ sub check_loginvia { } if ($newhost ne $lonhost) { if (&Apache::lonnet::hostname($newhost) ne '') { - $output = &redirect_page($newhost,$path); + if ($balcookie) { + my ($balancer,$cookie) = split(/:/,$balcookie); + if ($cookie =~ /^($match_domain)_($match_username)_([a-f0-9]+)$/) { + my ($udom,$uname,$cookieid) = ($1,$2,$3); + unless (&Apache::lonnet::delbalcookie($cookie,$balancer) eq 'ok') { + if ((-d $lonidsdir) && (opendir(my $dh,$lonidsdir))) { + while (my $filename=readdir($dh)) { + if ($filename=~/^(\Q$uname\E_\d+_\Q$udom\E_$match_lonid)\.id$/) { + my $handle = $1; + my %hash = + &Apache::lonnet::get_sessionfile_vars($handle,$lonidsdir, + ['request.balancercookie', + 'user.linkedenv']); + if ($hash{'request.balancercookie'} eq "$balancer:$cookieid") { + if (unlink("$lonidsdir/$filename")) { + if (($hash{'user.linkedenv'} =~ /^[a-f0-9]+_linked$/) && + (-l "$lonidsdir/$hash{'user.linkedenv'}.id") && + (readlink("$lonidsdir/$hash{'user.linkedenv'}.id") eq "$lonidsdir/$filename")) { + unlink("$lonidsdir/$hash{'user.linkedenv'}.id"); + } + } + } + last; + } + } + closedir($dh); + } + } + } + } + $output = &redirect_page($newhost,$path,$linkprot); } } } @@ -724,16 +890,23 @@ sub check_loginvia { } sub redirect_page { - my ($desthost,$path) = @_; + my ($desthost,$path,$linkprot) = @_; + my $hostname = &Apache::lonnet::hostname($desthost); my $protocol = $Apache::lonnet::protocol{$desthost}; $protocol = 'http' if ($protocol ne 'https'); unless ($path =~ m{^/}) { $path = '/'.$path; } - my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).$path; + my $url = $protocol.'://'.$hostname.$path; if ($env{'form.firsturl'} ne '') { $url .='?firsturl='.$env{'form.firsturl'}; } + if ($linkprot) { + my $ltoken = &Apache::lonnet::tmpput({linkprot => $linkprot},$desthost); + if ($ltoken) { + $url .= (($url =~ /\?/) ? '&' : '?').'ltoken='.$ltoken; + } + } my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef, {'redirect' => [0,$url],}); my $end_page = &Apache::loncommon::end_page();