--- loncom/auth/lonauth.pm 2021/12/16 21:48:19 1.121.2.23 +++ loncom/auth/lonauth.pm 2014/01/05 11:04:27 1.130 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.121.2.23 2021/12/16 21:48:19 raeburn Exp $ +# $Id: lonauth.pm,v 1.130 2014/01/05 11:04:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,6 +32,8 @@ 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(); @@ -40,12 +42,11 @@ use Fcntl qw(:flock); use Apache::lonlocal; use Apache::File(); use HTML::Entities; -use Digest::MD5; # ------------------------------------------------------------ Successful login sub success { my ($r, $username, $domain, $authhost, $lowerurl, $extra_env, - $form,$cid,$expirepub) = @_; + $form) = @_; # ------------------------------------------------------------ Get cookie ready my $cookie = @@ -59,9 +60,8 @@ sub success { # -------------------------------------------------------------------- Log this - my $ip = &Apache::lonnet::get_requestor_ip(); &Apache::lonnet::log($domain,$username,$authhost, - "Login $ip"); + "Login $ENV{'REMOTE_ADDR'}"); # ------------------------------------------------- Check for critical messages @@ -72,27 +72,8 @@ sub success { } } -# ------------------------------------------------------------ Get cookies ready - my ($securecookie,$defaultcookie); - my $ssl = $r->subprocess_env('https'); - if ($ssl) { - $securecookie="lonSID=$cookie; path=/; HttpOnly; secure"; - my $lonidsdir=$r->dir_config('lonIDsDir'); - if (($lonidsdir) && (-e "$lonidsdir/$cookie.id")) { - my $linkname=substr(Digest::MD5::md5_hex(Digest::MD5::md5_hex(time(). {}. rand(). $$)), 0, 32).'_linked'; - if (-e "$lonidsdir/$linkname.id") { - unlink("$lonidsdir/$linkname.id"); - } - my $made_symlink = eval { symlink("$lonidsdir/$cookie.id", - "$lonidsdir/$linkname.id"); 1 }; - if ($made_symlink) { - $defaultcookie = "lonLinkID=$linkname; path=/; HttpOnly;"; - &Apache::lonnet::appenv({'user.linkedenv' => $linkname}); - } - } - } else { - $defaultcookie = "lonID=$cookie; path=/; HttpOnly;"; - } +# ------------------------------------------------------------ Get cookie ready + $cookie="lonID=$cookie; path=/"; # -------------------------------------------------------- Menu script and info my $destination = $lowerurl; @@ -118,26 +99,18 @@ sub success { } if (defined($form->{symb})) { my $destsymb = $form->{symb}; - my $encrypted; - if ($destsymb =~ m{^/enc/}) { - $encrypted = 1; - if ($cid) { - $destsymb = &Apache::lonenc::unencrypted($destsymb,$cid); - } - } $destination .= ($destination =~ /\?/) ? '&' : '?'; if ($destsymb =~ /___/) { + # FIXME Need to deal with encrypted symbs and urls as needed. my ($map,$resid,$desturl)=split(/___/,$destsymb); - $desturl = &Apache::lonnet::clutter($desturl); - if ($encrypted) { - $desturl = &Apache::lonenc::encrypted($desturl,1,$cid); - $destsymb = $form->{symb}; + unless ($desturl=~/^(adm|editupload|public)/) { + $desturl = &Apache::lonnet::clutter($desturl); } $desturl = &HTML::Entities::encode($desturl,'"<>&'); $destsymb = &HTML::Entities::encode($destsymb,'"<>&'); $destination .= 'destinationurl='.$desturl. '&destsymb='.$destsymb; - } elsif (!$encrypted) { + } else { $destsymb = &HTML::Entities::encode($destsymb,'"<>&'); $destination .= 'destinationurl='.$destsymb; } @@ -147,38 +120,20 @@ sub success { $destination .= 'source=login'; } - my $windowinfo=&Apache::lonmenu::open($env{'browser.os'}); - my $startupremote=&Apache::lonmenu::startupremote($destination); - my $remoteinfo=&Apache::lonmenu::load_remote_msg($lowerurl); - my $setflags=&Apache::lonmenu::setflags(); - my $maincall=&Apache::lonmenu::maincall(); + my $windowinfo = Apache::lonhtmlcommon::scripttag('self.name="loncapaclient";'); + my $header = ''; my $brcrum = [{'href' => '', 'text' => 'Successful Login'},]; my $start_page=&Apache::loncommon::start_page('Successful Login', - $startupremote, - {'no_inline_link' => 1, - 'bread_crumbs' => $brcrum,}); + $header, + {'bread_crumbs' => $brcrum,}); my $end_page =&Apache::loncommon::end_page(); - my $continuelink; - if ($env{'environment.remote'} eq 'off') { - $continuelink=''.&mt('Continue').''; - } + my $continuelink=''.&mt('Continue').''; # ------------------------------------------------- Output for successful login &Apache::loncommon::content_type($r,'text/html'); - if ($securecookie) { - $r->headers_out->add('Set-cookie' => $securecookie); - } - if ($defaultcookie) { - $r->headers_out->add('Set-cookie' => $defaultcookie); - } - if ($expirepub) { - my $c = new CGI::Cookie(-name => 'lonPubID', - -value => '', - -expires => '-10y',); - $r->headers_out->add('Set-cookie' => $c); - } + $r->header_out('Set-cookie' => $cookie); $r->send_http_header; my %lt=&Apache::lonlocal::texthash( @@ -193,23 +148,19 @@ sub success { my $welcome = &mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','',''); $r->print(<$lt{'wel'} $welcome $loginhelp -$remoteinfo -$maincall $continuelink $end_page ENDSUCCESS - return; } # --------------------------------------------------------------- Failed login! sub failed { - my ($r,$message,$form,$authhost) = @_; + my ($r,$message,$form) = @_; (undef,undef,undef,my $clientmathml,my $clientunicode) = &Apache::loncommon::decode_user_agent(); my $args = {}; @@ -230,47 +181,33 @@ sub failed { if ($udom) { $retry .= (($retry=~/\?/)?'&':'?').'domain='.$udom; } - my $lonhost = $r->dir_config('lonHostID'); - my $querystr; - my $result = &set_retry_token($form,$lonhost,\$querystr); - if ($result eq 'fail') { - if (exists($form->{role})) { - my $role = &Apache::loncommon::cleanup_html($form->{role}); - if ($role ne '') { - $retry .= (($retry=~/\?/)?'&':'?').'role='.$role; - } - } - if (exists($form->{symb})) { - my $symb = &Apache::loncommon::cleanup_html($form->{symb}); - if ($symb ne '') { - $retry .= (($retry=~/\?/)?'&':'?').'symb='.$symb; - } + if (exists($form->{role})) { + my $role = &Apache::loncommon::cleanup_html($form->{role}); + if ($role ne '') { + $retry .= (($retry=~/\?/)?'&':'?').'role='.$role; } - if (exists($form->{firsturl})) { - my $firsturl = &Apache::loncommon::cleanup_html($form->{firsturl}); - if ($firsturl ne '') { - $retry .= (($retry=~/\?/)?'&':'?').'firsturl='.$firsturl; - } + } + if (exists($form->{symb})) { + my $symb = &Apache::loncommon::cleanup_html($form->{symb}); + if ($symb ne '') { + $retry .= (($retry=~/\?/)?'&':'?').'symb='.$symb; } - } elsif ($querystr ne '') { - $retry .= (($retry=~/\?/)?'&':'?').$querystr; } my $end_page = &Apache::loncommon::end_page(); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - my @actions = - (&mt('Please [_1]log in again[_2].','','')); my $loginhelp = &loginhelpdisplay($udom); if ($loginhelp) { - push(@actions, ''.&mt('Login problems?').''); + $loginhelp = '

'.&mt('Login problems?').'

'; } - #FIXME: link to helpdesk might be added here $r->print( $start_page - .'

'.&mt('Sorry ...').'

' - .&Apache::lonhtmlcommon::confirm_success(&mt($message),1).'

' - .&Apache::lonhtmlcommon::actionbox(\@actions) + .'

'.&mt('Sorry ...').'

' + .'

'.&mt($message).'

' + .'

'.&mt('Please [_1]log in again[_2].','','') + .'

' + .$loginhelp .$end_page ); } @@ -291,6 +228,7 @@ sub reroute { sub handler { my $r = shift; my $londocroot = $r->dir_config('lonDocRoot'); + my $form; # Are we re-routing? if (-e "$londocroot/lon-status/reroute.txt") { &reroute($r); @@ -316,24 +254,8 @@ sub handler { my $end_page = &Apache::loncommon::end_page(); my $dest = '/adm/roles'; - my %form = &get_form_items($r); - if ($form{'logtoken'}) { - my $tmpinfo = &Apache::lonnet::reply('tmpget:'.$form{'logtoken'}, - $form{'serverid'}); - unless (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost') || - ($tmpinfo eq 'no_such_host')) { - my ($des_key,$firsturl,@rest)=split(/&/,$tmpinfo); - $firsturl = &unescape($firsturl); - my %info; - foreach my $item (@rest) { - my ($key,$value) = split(/=/,$item); - $info{$key} = &unescape($value); - } - if ($firsturl ne '') { - $info{'firsturl'} = $firsturl; - $dest = $firsturl; - } - } + if ($env{'form.firsturl'} ne '') { + $dest = $env{'form.firsturl'}; } $r->print( $start_page @@ -349,7 +271,19 @@ sub handler { # ---------------------------------------------------- No valid token, continue - my %form = &get_form_items($r); + + my $buffer; + if ($r->header_in('Content-length') > 0) { + $r->read($buffer,$r->header_in('Content-length'),0); + } + my %form; + foreach my $pair (split(/&/,$buffer)) { + my ($name,$value) = split(/=/,$pair); + $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.', \%form); @@ -358,11 +292,10 @@ sub handler { # split user logging in and "su"-user - ($form{'uname'},$form{'suname'},$form{'sudom'})=split(/\:/,$form{'uname'}); + ($form{'uname'},$form{'suname'})=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{'sudom'} = &LONCAPA::clean_domain($form{'sudom'}); + $form{'udom'} = &LONCAPA::clean_domain( $form{'udom'}); my $role = $r->dir_config('lonRole'); my $domain = $r->dir_config('lonDefDomain'); @@ -374,6 +307,12 @@ sub handler { my $tmpinfo=Apache::lonnet::reply('tmpget:'.$form{'logtoken'}, $form{'serverid'}); + my %sessiondata; + if ($form{'iptoken'}) { + %sessiondata = &Apache::lonnet::tmpget($form{'iptoken'}); + my $delete = &Apache::lonnet::tmpdel($form{'token'}); + } + if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost') || ($tmpinfo eq 'no_such_host')) { &failed($r,'Information needed to verify your login information is missing, inaccessible or expired.',\%form); @@ -393,13 +332,40 @@ sub handler { return OK; } - my ($des_key,$firsturl,@rest)=split(/&/,$tmpinfo); - $firsturl = &unescape($firsturl); - foreach my $item (@rest) { - my ($key,$value) = split(/=/,$item); - $form{$key} = &unescape($value); + my ($key,$firsturl,$rolestr,$symbstr)=split(/&/,$tmpinfo); + if ($rolestr) { + $rolestr = &unescape($rolestr); + } + if ($symbstr) { + $symbstr= &unescape($symbstr); + } + 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; + } + 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($des_key,$form{'upass0'}); # ---------------------------------------------------------------- Authenticate @@ -430,8 +396,7 @@ sub handler { return OK; } my $start_page = - &Apache::loncommon::start_page('Create a user account in LON-CAPA', - '',{'no_inline_link' => 1,}); + &Apache::loncommon::start_page('Create a user account in LON-CAPA'); my $lonhost = $r->dir_config('lonHostID'); my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; my $contacts = @@ -461,10 +426,8 @@ sub handler { $firsturl='/adm/roles'; } - my ($hosthere,%sessiondata); + my $hosthere; if ($form{'iptoken'}) { - %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; @@ -473,68 +436,20 @@ sub handler { # --------------------------------- 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'},$sudomref)) { + if (&Apache::lonnet::privileged($form{'uname'},$form{'udom'})) { # ---------------------------------------------------- see if the su-user exists - unless (&Apache::lonnet::homeserver($suname,$sudom) eq 'no_host') { + unless (&Apache::lonnet::homeserver($form{'suname'},$form{'udom'}) + eq 'no_host') { + &Apache::lonnet::logthis(&Apache::lonnet::homeserver($form{'suname'},$form{'udom'})); # ------------------------------ see if the su-user is not too highly privileged - 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 { - + unless (&Apache::lonnet::privileged($form{'suname'},$form{'udom'})) { # -------------------------------------------------------- actually switch users - - &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; - } - } - } + &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'); } } } else { @@ -546,47 +461,18 @@ sub handler { unless ($hosthere) { ($is_balancer,$otherserver) = - &Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'},'login'); - if ($is_balancer) { - # 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); - if (($found_server) && ($balancer_cookie =~ /^\Q$env{'user.domain'}\E_\Q$env{'user.name'}\E_/)) { - $otherserver = $found_server; - } - 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($r,$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; - } - } - } + &Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'}); } - if (($is_balancer) && (!$hosthere)) { + if ($is_balancer) { + if (!$otherserver) { + ($otherserver) = &Apache::lonnet::choose_server($form{'udom'}); + } if ($otherserver) { &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef, \%form); - 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); + $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl); } else { - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; $r->print(&noswitch()); } return OK; @@ -596,20 +482,8 @@ sub handler { if ($otherserver) { &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef, \%form); - 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); + $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl); } else { - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; $r->print(&noswitch()); } return OK; @@ -630,7 +504,7 @@ sub handler { # ---------------------------------------------------------- Are we overloaded? if ((($userloadpercent>100.0)||($loadpercent>100.0))) { - my $unloaded=Apache::lonnet::spareserver($r,$loadpercent,$userloadpercent,1,$form{'udom'}); + my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent,1,$form{'udom'}); if (!$unloaded) { ($unloaded) = &Apache::lonnet::choose_server($form{'udom'}); } @@ -641,73 +515,12 @@ sub handler { return OK; } } - if (($is_balancer) && ($hosthere)) { - $form{'noloadbalance'} = $hosthere; - } - my $extra_env; - if (($hosthere) && ($sessiondata{'sessionserver'} ne '')) { - if ($sessiondata{'origurl'} ne '') { - $firsturl = $sessiondata{'origurl'}; - $form{'firsturl'} = $sessiondata{'origurl'}; - my @names = ('role','symb','linkprot','linkkey'); - foreach my $item (@names) { - if ($sessiondata{$item} ne '') { - $form{$item} = $sessiondata{$item}; - } - } - } - } &success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,undef, \%form); return OK; } } -sub get_form_items { - my ($r) = @_; - my $buffer; - if ($r->header_in('Content-length') > 0) { - $r->read($buffer,$r->header_in('Content-length'),0); - } - my %form; - foreach my $pair (split(/&/,$buffer)) { - my ($name,$value) = split(/=/,$pair); - $value =~ tr/+/ /; - $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - $form{$name}=$value; - } - return %form; -} - -sub set_retry_token { - my ($form,$lonhost,$querystr) = @_; - if (ref($form) eq 'HASH') { - my ($firsturl,$token,$extras,@names); - @names = ('role','symb','iptoken'); - foreach my $name (@names) { - if ($form->{$name} ne '') { - $extras .= '&'.$name.'='.&escape($form->{$name}); - last if ($name eq 'linkprot'); - } - } - my $firsturl = $form->{'firsturl'}; - if (($firsturl ne '') || ($extras ne '')) { - $extras .= ':retry'; - $token = &Apache::lonnet::reply('tmpput:'.&escape($firsturl). - $extras,$lonhost); - if (($token eq 'con_lost') || ($token eq 'no_such_host')) { - return 'fail'; - } else { - if (ref($querystr)) { - $$querystr = 'retry='.$token; - } - return 'ok'; - } - } - } - return; -} - sub check_can_host { my ($r,$form,$authhost,$domdesc) = @_; return unless (ref($form) eq 'HASH'); @@ -748,8 +561,6 @@ sub check_can_host { if ($login_host ne '') { my $protocol = $Apache::lonnet::protocol{$login_host}; $protocol = 'http' if ($protocol ne 'https'); - my $alias = &Apache::lonnet::use_proxy_alias($r,$login_host); - $hostname = $alias if ($alias ne ''); my $newurl = $protocol.'://'.$hostname.'/adm/createaccount'; $r->print(&Apache::loncommon::start_page('Create a user account in LON-CAPA'). '

'.&mt('Account creation').'

'.