--- loncom/auth/lonauth.pm 2012/08/27 11:55:26 1.121.2.2 +++ loncom/auth/lonauth.pm 2019/08/01 00:42:34 1.121.2.17 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.121.2.2 2012/08/27 11:55:26 raeburn Exp $ +# $Id: lonauth.pm,v 1.121.2.17 2019/08/01 00:42:34 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,8 +32,6 @@ use strict; use LONCAPA; use Apache::Constants qw(:common); use CGI qw(:standard); -use DynaLoader; # for Crypt::DES version -use Crypt::DES; use Apache::loncommon(); use Apache::lonnet; use Apache::lonmenu(); @@ -73,7 +71,7 @@ sub success { } # ------------------------------------------------------------ Get cookie ready - $cookie="lonID=$cookie; path=/"; + $cookie="lonID=$cookie; path=/; HttpOnly"; # -------------------------------------------------------- Menu script and info my $destination = $lowerurl; @@ -103,16 +101,14 @@ sub success { if ($destsymb =~ /___/) { # FIXME Need to deal with encrypted symbs and urls as needed. my ($map,$resid,$desturl)=split(/___/,$destsymb); - unless ($desturl=~/^(adm|uploaded|editupload|public)/) { - $desturl = &Apache::lonnet::clutter($desturl); - } + $desturl = &Apache::lonnet::clutter($desturl); $desturl = &HTML::Entities::encode($desturl,'"<>&'); $destsymb = &HTML::Entities::encode($destsymb,'"<>&'); - $destination .= '&destinationurl='.$desturl. + $destination .= 'destinationurl='.$desturl. '&destsymb='.$destsymb; } else { $destsymb = &HTML::Entities::encode($destsymb,'"<>&'); - $destination .= '&destinationurl='.$destsymb; + $destination .= 'destinationurl='.$destsymb; } } if ($destination =~ m{^/adm/roles}) { @@ -165,36 +161,61 @@ $maincall $continuelink $end_page ENDSUCCESS + return; } # --------------------------------------------------------------- Failed login! sub failed { my ($r,$message,$form) = @_; - my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef); - my $retry = '/adm/login?username='.$form->{'uname'}. - '&domain='.$form->{'udom'}; + (undef,undef,undef,my $clientmathml,my $clientunicode) = + &Apache::loncommon::decode_user_agent(); + my $args = {}; + if ($clientunicode && !$clientmathml) { + $args = {'browser.unicode' => 1}; + } + + my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,$args); + my $uname = &Apache::loncommon::cleanup_html($form->{'uname'}); + my $udom = &Apache::loncommon::cleanup_html($form->{'udom'}); + if (&Apache::lonnet::domain($udom,'description') eq '') { + undef($udom); + } + my $retry = '/adm/login'; + if ($uname eq $form->{'uname'}) { + $retry .= '?username='.$uname; + } + if ($udom) { + $retry .= (($retry=~/\?/)?'&':'?').'domain='.$udom; + } if (exists($form->{role})) { - $retry .= '&role='.$form->{role}; + my $role = &Apache::loncommon::cleanup_html($form->{role}); + if ($role ne '') { + $retry .= (($retry=~/\?/)?'&':'?').'role='.$role; + } } if (exists($form->{symb})) { - $retry .= '&symb='.$form->{symb}; + my $symb = &Apache::loncommon::cleanup_html($form->{symb}); + if ($symb ne '') { + $retry .= (($retry=~/\?/)?'&':'?').'symb='.$symb; + } } - my $end_page = &Apache::loncommon::end_page(); + my $end_page = &Apache::loncommon::end_page(); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - my $loginhelp = &loginhelpdisplay($form->{'udom'}); + my @actions = + (&mt('Please [_1]log in again[_2].','','')); + my $loginhelp = &loginhelpdisplay($udom); if ($loginhelp) { - $loginhelp = '
'; + push(@actions, ''.&mt('Login problems?').''); } + #FIXME: link to helpdesk might be added here $r->print( $start_page - .''.&mt($message).'
' - .''.&mt('Please [_1]log in again[_2].','','') - .'
' - .$loginhelp + .'' + .'
'.&mt('You are already logged in!').'
' .''.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].' ,'','','','') .'
' @@ -269,7 +289,7 @@ sub handler { $value =~ tr/+/ /; $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; $form{$name}=$value; - } + } if ((!$form{'uname'}) || (!$form{'upass0'}) || (!$form{'udom'})) { &failed($r,'Username, password and domain need to be specified.', @@ -279,10 +299,11 @@ sub handler { # split user logging in and "su"-user - ($form{'uname'},$form{'suname'})=split(/\:/,$form{'uname'}); + ($form{'uname'},$form{'suname'},$form{'sudom'})=split(/\:/,$form{'uname'}); $form{'uname'} = &LONCAPA::clean_username($form{'uname'}); $form{'suname'}= &LONCAPA::clean_username($form{'suname'}); - $form{'udom'} = &LONCAPA::clean_domain( $form{'udom'}); + $form{'udom'} = &LONCAPA::clean_domain($form{'udom'}); + $form{'sudom'} = &LONCAPA::clean_domain($form{'sudom'}); my $role = $r->dir_config('lonRole'); my $domain = $r->dir_config('lonDefDomain'); @@ -313,40 +334,27 @@ sub handler { return OK; } - my ($key,$firsturl,$rolestr,$symbstr)=split(/&/,$tmpinfo); + my ($key,$firsturl,$rolestr,$symbstr,$iptokenstr)=split(/&/,$tmpinfo); if ($rolestr) { $rolestr = &unescape($rolestr); } if ($symbstr) { $symbstr= &unescape($symbstr); } + if ($iptokenstr) { + $iptokenstr = &unescape($iptokenstr); + } if ($rolestr =~ /^role=/) { (undef,$form{'role'}) = split('=',$rolestr); } if ($symbstr =~ /^symb=/) { (undef,$form{'symb'}) = split('=',$symbstr); } - - my $keybin=pack("H16",$key); - - my $cipher; - if ($Crypt::DES::VERSION>=2.03) { - $cipher=new Crypt::DES $keybin; + if ($iptokenstr =~ /^iptoken=/) { + (undef,$form{'iptoken'}) = split('=',$iptokenstr); } - else { - $cipher=new DES $keybin; - } - my $upass=''; - for (my $i=0;$i<=2;$i++) { - my $chunk= - $cipher->decrypt(unpack("a8",pack("H16",substr($form{'upass'.$i},0,16)))); - - $chunk.= - $cipher->decrypt(unpack("a8",pack("H16",substr($form{'upass'.$i},16,16)))); - $chunk=substr($chunk,1,ord(substr($chunk,0,1))); - $upass.=$chunk; - } + my $upass = &Apache::loncommon::des_decrypt($key,$form{'upass0'}); # ---------------------------------------------------------------- Authenticate @@ -407,22 +415,81 @@ sub handler { ($firsturl=~/^\/adm\/(logout|remote)/)) { $firsturl='/adm/roles'; } + + my $hosthere; + if ($form{'iptoken'}) { + my %sessiondata = &Apache::lonnet::tmpget($form{'iptoken'}); + my $delete = &Apache::lonnet::tmpdel($form{'iptoken'}); + if (($sessiondata{'domain'} eq $form{'udom'}) && + ($sessiondata{'username'} eq $form{'uname'})) { + $hosthere = 1; + } + } + # --------------------------------- Are we attempting to login as somebody else? if ($form{'suname'}) { + my ($suname,$sudom,$sudomref); + $suname = $form{'suname'}; + $sudom = $form{'udom'}; + if ($form{'sudom'}) { + unless ($sudom eq $form{'sudom'}) { + if (&Apache::lonnet::domain($form{'sudom'})) { + $sudomref = [$form{'sudom'}]; + $sudom = $form{'sudom'}; + } + } + } # ------------ see if the original user has enough privileges to pull this stunt - if (&Apache::lonnet::privileged($form{'uname'},$form{'udom'})) { + if (&Apache::lonnet::privileged($form{'uname'},$form{'udom'},$sudomref)) { # ---------------------------------------------------- see if the su-user exists - unless (&Apache::lonnet::homeserver($form{'suname'},$form{'udom'}) - eq 'no_host') { - &Apache::lonnet::logthis(&Apache::lonnet::homeserver($form{'suname'},$form{'udom'})); + unless (&Apache::lonnet::homeserver($suname,$sudom) eq 'no_host') { # ------------------------------ see if the su-user is not too highly privileged - unless (&Apache::lonnet::privileged($form{'suname'},$form{'udom'})) { + if (&Apache::lonnet::privileged($suname,$sudom)) { + &Apache::lonnet::logthis('Attempted switch user to privileged user'); + } else { + my $noprivswitch; +# +# su-user's home server and user's home server must have one of: +# (a) same domain +# (b) same primary library server for the two domains +# (c) same "internet domain" for primary library server(s) for home servers' domains +# + my $suprim = &Apache::lonnet::domain($sudom,'primary'); + my $suintdom = &Apache::lonnet::internet_dom($suprim); + unless ($sudom eq $form{'udom'}) { + my $uprim = &Apache::lonnet::domain($form{'udom'},'primary'); + my $uintdom = &Apache::lonnet::internet_dom($uprim); + unless ($suprim eq $uprim) { + unless ($suintdom eq $uintdom) { + &Apache::lonnet::logthis('Attempted switch user ' + .'to user with different "internet domain".'); + $noprivswitch = 1; + } + } + } + + unless ($noprivswitch) { +# +# server where log-in occurs must have same "internet domain" as su-user's home +# server +# + my $lonhost = $r->dir_config('lonHostID'); + my $hostintdom = &Apache::lonnet::internet_dom($lonhost); + if ($hostintdom ne $suintdom) { + &Apache::lonnet::logthis('Attempted switch user on a ' + .'server with a different "internet domain".'); + } else { + # -------------------------------------------------------- actually switch users - &Apache::lonnet::logperm('User '.$form{'uname'}.' at '.$form{'udom'}. - ' logging in as '.$form{'suname'}); - $form{'uname'}=$form{'suname'}; - } else { - &Apache::lonnet::logthis('Attempted switch user to privileged user'); + + &Apache::lonnet::logperm('User '.$form{'uname'}.' at '. + $form{'udom'}.' logging in as '.$suname.':'.$sudom); + $form{'uname'}=$suname; + if ($form{'udom'} ne $sudom) { + $form{'udom'}=$sudom; + } + } + } } } } else { @@ -430,17 +497,43 @@ sub handler { } } - my ($is_balancer,$otherserver) = - &Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'}); + my ($is_balancer,$otherserver); - if ($is_balancer) { - if (!$otherserver) { - ($otherserver) = &Apache::lonnet::choose_server($form{'udom'}); + unless ($hosthere) { + ($is_balancer,$otherserver) = + &Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'},'login'); + if ($is_balancer) { + if ($otherserver eq '') { + my $lowest_load; + ($otherserver,undef,undef,undef,$lowest_load) = &Apache::lonnet::choose_server($form{'udom'}); + if ($lowest_load > 100) { + $otherserver = &Apache::lonnet::spareserver($lowest_load,$lowest_load,1,$form{'udom'}); + } + } + if ($otherserver ne '') { + my @hosts = &Apache::lonnet::current_machine_ids(); + if (grep(/^\Q$otherserver\E$/,@hosts)) { + $hosthere = $otherserver; + } + } } + } + + if (($is_balancer) && (!$hosthere)) { if ($otherserver) { &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef, \%form); - $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl); + my $switchto = '/adm/switchserver?otherserver='.$otherserver; + if (($firsturl) && ($firsturl ne '/adm/switchserver') && ($firsturl ne '/adm/roles')) { + $switchto .= '&origurl='.$firsturl; + } + if ($form{'role'}) { + $switchto .= '&role='.$form{'role'}; + } + if ($form{'symb'}) { + $switchto .= '&symb='.$form{'symb'}; + } + $r->internal_redirect($switchto); } else { $r->print(&noswitch()); } @@ -451,7 +544,17 @@ sub handler { if ($otherserver) { &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef, \%form); - $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl); + my $switchto = '/adm/switchserver?otherserver='.$otherserver; + if (($firsturl) && ($firsturl ne '/adm/switchserver') && ($firsturl ne '/adm/roles')) { + $switchto .= '&origurl='.$firsturl; + } + if ($form{'role'}) { + $switchto .= '&role='.$form{'role'}; + } + if ($form{'symb'}) { + $switchto .= '&symb='.$form{'symb'}; + } + $r->internal_redirect($switchto); } else { $r->print(&noswitch()); } @@ -484,6 +587,9 @@ sub handler { return OK; } } + if (($is_balancer) && ($hosthere)) { + $form{'noloadbalance'} = $hosthere; + } &success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,undef, \%form); return OK;