'.&mt('You are already logged in!').'
' .''.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].', '','','','').'
' + .'--- loncom/auth/lonlogin.pm 2021/10/26 15:52:54 1.192 +++ loncom/auth/lonlogin.pm 2025/02/09 22:42:12 1.209 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.192 2021/10/26 15:52:54 raeburn Exp $ +# $Id: lonlogin.pm,v 1.209 2025/02/09 22:42:12 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -49,11 +49,34 @@ sub handler { (join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'}, $ENV{'REDIRECT_QUERY_STRING'}), ['interface','username','domain','firsturl','localpath','localres', - 'token','role','symb','iptoken','btoken','ltoken','linkkey','saml', - 'sso','retry']); + 'token','role','symb','iptoken','btoken','ltoken','ttoken','linkkey', + 'saml','sso','retry','display']); + +# -- check if they are a migrating user + if (defined($env{'form.token'})) { + return &Apache::migrateuser::handler($r); + } + my $lonhost = $r->dir_config('lonHostID'); - my $linkkey; - if (($env{'form.sso'}) || ($env{'form.retry'})) { + if ($env{'form.ttoken'}) { + my %info = &Apache::lonnet::tmpget($env{'form.ttoken'}); + &Apache::lonnet::tmpdel($env{'form.ttoken'}); + if ($info{'origurl'}) { + $env{'form.firsturl'} = $info{'origurl'}; + } + if ($info{'ltoken'}) { + $env{'form.ltoken'} = $info{'ltoken'}; + } elsif ($info{'linkprot'}) { + $env{'form.linkprot'} = $info{'linkprot'}; + foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') { + if ($info{$item} ne '') { + $env{'form.'.$item} = $info{$item}; + } + } + } elsif ($info{'linkkey'} ne '') { + $env{'form.linkkey'} = $info{'linkkey'}; + } + } elsif (($env{'form.sso'}) || ($env{'form.retry'})) { my $infotoken; if ($env{'form.sso'}) { $infotoken = $env{'form.sso'}; @@ -70,9 +93,6 @@ sub handler { &Apache::lonnet::tmpdel($infotoken); } } else { - if ($env{'form.linkkey'}) { - $linkkey = $env{'form.linkkey'}; - } if (!defined($env{'form.firsturl'})) { &Apache::lonacc::get_posted_cgi($r,['firsturl']); } @@ -82,7 +102,7 @@ sub handler { } } if (($env{'form.firsturl'} =~ m{^/+tiny/+$LONCAPA::match_domain/+\w+$}) && - (!$env{'form.ltoken'}) && (!$env{'form.linkkey'})) { + (!$env{'form.ltoken'}) && (!$env{'form.linkprot'}) && (!$env{'form.linkkey'})) { &Apache::lonacc::get_posted_cgi($r,['linkkey']); } if ($env{'form.firsturl'} eq '/adm/logout') { @@ -90,11 +110,6 @@ sub handler { } } -# -- check if they are a migrating user - if (defined($env{'form.token'})) { - return &Apache::migrateuser::handler($r); - } - # 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'); @@ -149,31 +164,58 @@ sub handler { $protocol = 'http' if ($protocol ne 'https'); my $dest = '/adm/roles'; if ($env{'form.firsturl'} ne '') { - if ($env{'form.firsturl'} =~ /[^\x00-\xFF]/) { - $dest = &uri_escape_utf8($env{'form.firsturl'}); - } else { - $dest = &uri_escape($env{'form.firsturl'}); - } - $dest = &HTML::Entities::encode($dest,"'"); + $dest = &HTML::Entities::encode($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'}; + if ($env{'form.role'}) { + $info{'role'} = $env{'form.role'}; + } + if ($env{'form.symb'}) { + $info{'symb'} = $env{'form.symb'}; + } + if (($env{'form.firsturl'} eq '/adm/email') && ($env{'form.display'} ne '')) { + if ($env{'form.sso'}) { + if ($env{'form.mailrecip'}) { + $info{'display'} = &escape($env{'form.display'}); + $info{'mailrecip'} = &escape($env{'form.mailrecip'}); + } + } else { + if (($env{'form.username'}) && ($env{'form.domain'})) { + $info{'display'} = &escape($env{'form.display'}); + $info{'mailrecip'} = &escape($env{'form.username'}.':'.$env{'form.domain'}); + } } - &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) { + unless (($balancer_token eq 'con_lost') || ($balancer_token eq 'refused') || + ($balancer_token eq 'unknown_cmd') || ($balancer_token eq 'no_such_host')) { $dest .= (($dest=~/\?/)?'&':'?') . 'btoken='.$balancer_token; } + if ($env{'form.firsturl'} =~ m{^/tiny/$match_domain/\w+$}) { + my %link_info; + if ($env{'form.ltoken'}) { + $link_info{'ltoken'} = $env{'form.ltoken'}; + } elsif ($env{'form.linkprot'}) { + $link_info{'linkprot'} = $env{'form.linkprot'}; + foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') { + if ($env{'form.'.$item} ne '') { + $link_info{$item} = $env{'form.'.$item}; + } + } + } elsif ($env{'form.linkkey'} ne '') { + $link_info{'linkkey'} = $env{'form.linkkey'}; + } + if (keys(%link_info)) { + $link_info{'origurl'} = $env{'form.firsturl'}; + my $token = &Apache::lonnet::tmpput(\%link_info,$found_server,'link'); + unless (($token eq 'con_lost') || ($token eq 'refused') || + ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) { + $dest .= (($dest=~/\?/)?'&':'?') . 'ttoken='.$token; + } + } + } unless ($found_server eq $lonhost) { my $alias = &Apache::lonnet::use_proxy_alias($r,$found_server); $hostname = $alias if ($alias ne ''); @@ -193,21 +235,22 @@ sub handler { # it a balancer cookie for an active session on this server. # - my ($balcookie,$linkprot,$linkkey); + my $balcookie; 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 (($env{'form.firsturl'} eq '/adm/email') && + (exists($info{'display'})) && (exists($info{'mailrecip'}))) { + $env{'form.display'} = &unescape($info{'display'}); + $env{'form.mailrecip'} = &unescape($info{'mailrecip'}); + } } + (undef,undef,undef,my $clientmathml,my $clientunicode,undef,my $clientmobile) = + &Apache::loncommon::decode_user_agent($r); + # # 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 @@ -228,28 +271,61 @@ sub handler { # -------------------------------- Prevent users from attempting to login twice if ($handle ne '') { &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); + my $args = {}; + if ($clientunicode && !$clientmathml) { + $args->{'browser.unicode'} = 1; + } my $start_page = - &Apache::loncommon::start_page('Already logged in'); + &Apache::loncommon::start_page('Already logged in','',$args); my $end_page = &Apache::loncommon::end_page(); my $dest = '/adm/roles'; if ($env{'form.firsturl'} ne '') { - if ($env{'form.firsturl'} =~ /[^\x00-\xFF]/) { - $dest = &uri_escape_utf8($env{'form.firsturl'}); - } else { - $dest = &uri_escape($env{'form.firsturl'}); - } - $dest = &HTML::Entities::encode($dest,"'"); + $dest = &HTML::Entities::encode($env{'form.firsturl'},'\'"<>&'); } - if (($env{'form.ltoken'}) || ($linkprot)) { - unless ($linkprot) { + if (($env{'form.ltoken'}) || ($env{'form.linkprot'})) { + my ($linkprot,$linkprotuser,$linkprotexit,$linkprotpbid,$linkprotpburl); + if ($env{'form.ltoken'}) { my %info = &Apache::lonnet::tmpget($env{'form.ltoken'}); $linkprot = $info{'linkprot'}; - my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'}); - delete($env{'form.ltoken'}); + if ($info{'linkprotuser'} ne '') { + $linkprotuser = $info{'linkprotuser'}; + } + if ($info{'linkprotexit'} ne '') { + $linkprotexit = $info{'linkprotexit'}; + } + if ($info{'linkprotpbid'} ne '') { + $linkprotpbid = $info{'linkprotpbid'}; + } + if ($info{'linkprotpburl'} ne '') { + $linkprotpburl = $info{'linkprotpburl'}; + } + } else { + $linkprot = $env{'form.linkprot'}; + $linkprotuser = $env{'form.linkprotuser'}; + $linkprotexit = $env{'form.linkprotexit'}; + $linkprotpbid = $env{'form.linkprotpbid'}; + $linkprotpburl = $env{'form.linkprotpburl'}; } if ($linkprot) { my ($linkprotector,$deeplink) = split(/:/,$linkprot,2); + if (($deeplink =~ m{^/tiny/$match_domain/\w+$}) && + ($linkprotuser ne '') && ($linkprotuser ne $env{'user.name'}.':'.$env{'user.domain'})) { + my $ip = &Apache::lonnet::get_requestor_ip(); + my %linkprotinfo = ( + origurl => $deeplink, + linkprot => $linkprot, + linkprotuser => $linkprotuser, + linkprotexit => $linkprotexit, + linkprotpbid => $linkprotpbid, + linkprotpburl => $linkprotpburl, + ); + if ($env{'form.ltoken'}) { + my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'}); + } + &Apache::migrateuser::logout($r,$ip,$handle,undef,undef,\%linkprotinfo); + return OK; + } if ($env{'user.linkprotector'}) { my @protectors = split(/,/,$env{'user.linkprotector'}); unless (grep(/^\Q$linkprotector\E$/,@protectors)) { @@ -271,16 +347,14 @@ sub handler { &Apache::lonnet::appenv({'user.linkproturi' => $deeplink}); } } - } elsif (($env{'form.linkkey'}) || ($linkkey)) { + } elsif ($env{'form.linkkey'} ne '') { if ($env{'form.firsturl'} =~ m{^/tiny/$match_domain/\w+$}) { - if ($linkkey eq '') { - $linkkey = $env{'form.linkkey'}; - } + my $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))}); + &Apache::lonnet::appenv({'user.deeplinkkey' => join(',',sort(@linkkeys))}); } } else { &Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey}); @@ -297,11 +371,27 @@ sub handler { } } } + if ($env{'form.ltoken'}) { + my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'}); + } + if (($env{'form.firsturl'} eq '/adm/email') && ($env{'form.display'})) { + if ($env{'form.mailrecip'}) { + if ($env{'form.mailrecip'} eq "$env{'user.name'}:$env{'user.domain'}") { + $dest .= (($dest=~/\?/)?'&':'?') . 'display='.&escape($env{'form.display'}). + '&mailrecip='.&escape($env{'form.mailrecip'}); + } + } elsif (($env{'form.username'} eq $env{'user.name'}) && ($env{'form.domain'} eq $env{'user.domain'})) { + $dest .= (($dest=~/\?/)?'&':'?') . 'display='.&escape($env{'form.display'}). + '&mailrecip='.&escape("$env{'user.name'}:$env{'form.domain'}"); + } + } $r->print( $start_page + .'
'.&mt('You are already logged in!').'
' .''.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].', '','','','').'
' + .''.&mt('Please attempt to login to one of the following servers:') .'
' .$spares); } - $r->print('' + $r->print('