--- loncom/auth/lonlogin.pm 2022/06/18 02:10:18 1.199 +++ 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.199 2022/06/18 02:10:18 raeburn Exp $ +# $Id: lonlogin.pm,v 1.209 2025/02/09 22:42:12 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -50,7 +50,7 @@ sub handler { $ENV{'REDIRECT_QUERY_STRING'}), ['interface','username','domain','firsturl','localpath','localres', 'token','role','symb','iptoken','btoken','ltoken','ttoken','linkkey', - 'saml','sso','retry']); + 'saml','sso','retry','display']); # -- check if they are a migrating user if (defined($env{'form.token'})) { @@ -68,8 +68,10 @@ sub handler { $env{'form.ltoken'} = $info{'ltoken'}; } elsif ($info{'linkprot'}) { $env{'form.linkprot'} = $info{'linkprot'}; - if ($info{'linkprotuser'} ne '') { - $env{'form.linkprotuser'} = $info{'linkprotuser'}; + 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'}; @@ -173,6 +175,19 @@ sub handler { 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'}); + } + } + } my $balancer_token = &Apache::lonnet::tmpput(\%info,$found_server); unless (($balancer_token eq 'con_lost') || ($balancer_token eq 'refused') || ($balancer_token eq 'unknown_cmd') || ($balancer_token eq 'no_such_host')) { @@ -184,8 +199,10 @@ sub handler { $link_info{'ltoken'} = $env{'form.ltoken'}; } elsif ($env{'form.linkprot'}) { $link_info{'linkprot'} = $env{'form.linkprot'}; - if ($env{'form.linkprotuser'} ne '') { - $link_info{'linkprotuser'} = $env{'form.linkprotuser'}; + 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'}; @@ -224,8 +241,16 @@ sub handler { $balcookie = $info{'balcookie'}; &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 @@ -246,8 +271,12 @@ 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'; @@ -255,17 +284,28 @@ sub handler { $dest = &HTML::Entities::encode($env{'form.firsturl'},'\'"<>&'); } if (($env{'form.ltoken'}) || ($env{'form.linkprot'})) { - my ($linkprot,$linkprotuser); + my ($linkprot,$linkprotuser,$linkprotexit,$linkprotpbid,$linkprotpburl); if ($env{'form.ltoken'}) { my %info = &Apache::lonnet::tmpget($env{'form.ltoken'}); $linkprot = $info{'linkprot'}; if ($info{'linkprotuser'} ne '') { $linkprotuser = $info{'linkprotuser'}; - } - my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'}); + } + 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); @@ -276,7 +316,13 @@ sub handler { 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; } @@ -325,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].', '','','','').'

' + .'
' .$end_page ); return OK; @@ -355,9 +417,6 @@ sub handler { # ----------------------------------------------------------- Process Interface $env{'form.interface'}=~s/\W//g; - (undef,undef,undef,undef,undef,undef,my $clientmobile) = - &Apache::loncommon::decode_user_agent($r); - my $iconpath= &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); @@ -450,7 +509,8 @@ sub handler { # -------------------------------------------------------- Store away log token my ($tokenextras,$tokentype,$linkprot_for_login); - my @names = ('role','symb','iptoken','ltoken','linkprotuser','linkprot','linkkey'); + my @names = ('role','symb','iptoken','ltoken','linkprotuser','linkprotexit', + 'linkprot','linkkey','display','linkprotpbid','linkprotpburl'); foreach my $name (@names) { if ($env{'form.'.$name} ne '') { if ($name eq 'ltoken') { @@ -458,12 +518,24 @@ sub handler { if ($info{'linkprot'}) { $linkprot_for_login = $info{'linkprot'}; $tokenextras .= '&linkprot='.&escape($info{'linkprot'}); - if ($info{'linkprotuser'}) { - $tokenextras .= '&linkprotuser='.&escape($info{'linkprotuser'}); + foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') { + if ($info{$item}) { + $tokenextras .= '&'.$item.'='.&escape($info{$item}); + } } $tokentype = 'link'; last; } + } elsif ($env{'form.display'} && ($env{'form.firsturl'} eq '/adm/email')) { + if (($env{'form.mailrecip'}) || + ($env{'form.username'} =~ /^$match_username$/) && ($env{'form.domain'} =~ /^$match_domain$/)) { + $tokenextras .= '&'.$name.'='.&escape($env{'form.display'}); + if ($env{'form.mailrecip'}) { + $tokenextras .= '&mailrecip='.&escape($env{'form.mailrecip'}); + } else { + $tokenextras .= '&mailrecip='.&escape($env{'form.username'}.':'.$env{'form.domain'}); + } + } } else { $tokenextras .= '&'.$name.'='.&escape($env{'form.'.$name}); if (($name eq 'linkkey') || ($name eq 'linkprot')) { @@ -552,17 +624,34 @@ sub handler { .'' .'' .&mt('The LearningOnline Network with CAPA') - .'' + .'' + .'' .'' + .'
' .'

'.&mt('The LearningOnline Network with CAPA').'

' .'broken icon' - .'

'.&mt('This LON-CAPA server is temporarily not available for login.').'

'); + .'
' + .'
' + .'

'.&mt('This LON-CAPA server is temporarily not available for login.').'

'); if ($spares) { $r->print('

'.&mt('Please attempt to login to one of the following servers:') .'

' .$spares); } - $r->print('' + $r->print('
' .'' ); return OK; @@ -648,7 +737,8 @@ function enableInput() { ENDSCRIPT my ($lonhost_in_use,@hosts,%defaultdomconf,$saml_prefix,$saml_landing, - $samlssotext,$samlnonsso,$samlssoimg,$samlssoalt,$samlssourl,$samltooltip); + $samlssotext,$samlnonsso,$samlssoimg,$samlssoalt,$samlssourl,$samltooltip, + $samlwindow); %defaultdomconf = &Apache::loncommon::get_domainconf($defdom); @hosts = &Apache::lonnet::current_machine_ids(); $lonhost_in_use = $lonhost; @@ -669,6 +759,7 @@ ENDSCRIPT $samlssoalt = $defaultdomconf{$saml_prefix.'alt_'.$lonhost_in_use}; $samlssourl = $defaultdomconf{$saml_prefix.'url_'.$lonhost_in_use}; $samltooltip = $defaultdomconf{$saml_prefix.'title_'.$lonhost_in_use}; + $samlwindow = $defaultdomconf{$saml_prefix.'window_'.$lonhost_in_use}; } if ($saml_landing) { if ($samlssotext eq '') { @@ -744,10 +835,16 @@ ENDSAMLJS } } - $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js, - { 'redirect' => [$expire,'/adm/roles'], - 'add_entries' => \%add_entries, - 'only_body' => 1,})); + my $args = { + 'redirect' => [$expire,'/adm/roles'], + 'add_entries' => \%add_entries, + 'only_body' => 1, + }; + if ($clientunicode && !$clientmathml) { + $args->{'browser.unicode'} = 1; + } + $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login', + $js,$args)); # ----------------------------------------------------------------------- Texts @@ -789,8 +886,17 @@ ENDSAMLJS .' style="margin:0 auto; padding:10px; width:90%; height: auto; background-color:#FFFFFF;">' ); + my $target = '_top'; + if ($sessiondata{'linkprot'}) { + my ($linkprotector,$deeplink) = split(/:/,$sessiondata{'linkprot'},2); + if (($deeplink eq $sessiondata{'origurl'}) && + (($sessiondata{'linkprotuser'} eq $sessiondata{'username'}.':'.$sessiondata{'domain'}) || + ($sessiondata{'linkprotuser'} eq $sessiondata{'username'}))) { + $target = '_self'; + } + } $r->print(< +
@@ -848,16 +954,22 @@ LFORM } $r->print(< -
+
+

$alttext +

HEADER + } else { + $r->print(''); } my $stdauthformstyle = 'inline-block'; my $ssoauthstyle = 'none'; + my $sso_onclick; my $logintype; - $r->print('
'); + $r->print('
'); if ($saml_landing) { $ssoauthstyle = 'inline-block'; $stdauthformstyle = 'none'; @@ -866,6 +978,8 @@ HEADER if ($samlssourl ne '') { $ssologin = $samlssourl; } + my $ssologin_for_js = &js_escape($ssologin); + my $querystr_for_js; if (($logtoken eq 'con_lost') || ($logtoken eq 'no_such_host')) { my $querystring; if ($env{'form.firsturl'} ne '') { @@ -886,16 +1000,44 @@ HEADER } if ($querystring ne '') { $ssologin .= (($ssologin=~/\?/)?'&':'?') . $querystring; + $querystr_for_js = &js_escape($querystring); } } elsif ($logtoken ne '') { $ssologin .= (($ssologin=~/\?/)?'&':'?') . 'logtoken='.$logtoken; + $querystr_for_js = &js_escape('logtoken='.$logtoken); } my $ssohref; + if ($samlwindow) { + $sso_onclick = <<"ENDJS"; +if (document.getElementById('LC_sso_login_link')) { + var ssoelem = document.getElementById('LC_sso_login_link') + ssoelem.addEventListener('click',samlWinFunction,false); + var windows = {}; + function samlWinFunction(evt) { + evt.preventDefault(); + var url = '$ssologin_for_js'; + var name = 'lcssowin'; + var querystr = '$querystr_for_js'; + if (querystr) { + url += '?'+querystr+'&lcssowin=1'; + } else { + url += '?lcssowin=1'; + } + if ((typeof windows[name] !== 'undefined') && (!windows[name].closed)) { + windows[name].close(); + } + windows[name]=window.open(url,name,'width=350,height=600'); + windows[name].focus(); + return false; + } +} +ENDJS + } if ($samlssoimg ne '') { - $ssohref = ''. + $ssohref = ''. ''.$samlssoalt.''; } else { - $ssohref = ''.$samlssotext.''; + $ssohref = ''.$samlssotext.''; } if (($env{'form.saml'} eq 'no') || (($env{'form.username'} ne '') && ($env{'form.domain'} ne ''))) { @@ -950,11 +1092,22 @@ ENDTARG // ENDJS } + } elsif ($samlwindow) { + $in_frame_js = < +// + +ENDJS } $r->print(<
ENDTOP - my ($domainrow,$serverrow,$loadrow,$userloadrow,$versionrow); + my ($domainrow,$serverrow,$loadrow,$userloadrow,$versioninfo); $domainrow = <<"END"; - + $lt{'dom'}:  - - + +  $domain END $serverrow = <<"END"; - + $lt{'serv'}:  - +  $lonhost ($role) @@ -1009,9 +1162,9 @@ END if ($loadlim) { $loadrow = <<"END"; - + $lt{'load'}:  - +  $loadpercent $lt{'perc'} @@ -1021,9 +1174,9 @@ END if ($uloadlim) { $userloadrow = <<"END"; - + $lt{'userload'}:  - +  $userloadpercent $lt{'perc'} @@ -1031,28 +1184,24 @@ END END } if (($version ne '') && ($version ne '')) { - $versionrow = <<"END"; - - - $version - - -END + $versioninfo = "$version"; } $r->print(<
$domainrow $serverrow $loadrow $userloadrow -$versionrow
+ $versioninfo
$domainlogo
+

@@ -1149,6 +1298,7 @@ sub redirect_page { $path = '/'.$path; } my $url = $protocol.'://'.$hostname.$path; + my $args = {}; if ($env{'form.firsturl'} =~ m{^/tiny/$match_domain/\w+$}) { $url = $protocol.'://'.$hostname.$env{'form.firsturl'}; if (($env{'form.ltoken'}) || ($env{'form.linkprot'} ne '') || @@ -1157,11 +1307,15 @@ sub redirect_page { if ($env{'form.ltoken'}) { %link_info = &Apache::lonnet::tmpget($env{'form.ltoken'}); &Apache::lonnet::tmpdel($env{'form.ltoken'}); + $args->{'only_body'} = 1; } elsif ($env{'form.linkprot'}) { $link_info{'linkprot'} = $env{'form.linkprot'}; - if ($env{'form.linkprotuser'}) { - $link_info{'linkprotuser'} = $env{'form.linkprotuser'}; + foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') { + if ($env{'form.'.$item}) { + $link_info{$item} = $env{'form.'.$item}; + } } + $args->{'only_body'} = 1; } elsif ($env{'form.linkkey'} ne '') { $link_info{'linkkey'} = $env{'form.linkkey'}; } @@ -1196,8 +1350,8 @@ sub redirect_page { } $url .= $querystring; } - my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef, - {'redirect' => [0,$url],}); + $args->{'redirect'} = [0,$url,'','',1]; + my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,$args); my $end_page = &Apache::loncommon::end_page(); return $start_page.$end_page; }