'.&mt($message).'
' + .''.&mt('Please [_1]log in again[_2].','','') + .'
' + .$loginhelp .$end_page ); } @@ -262,9 +195,9 @@ sub reroute { my ($r) = @_; &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - my $msg=''.&mt('Sorry ...').''.&mt('You are already logged in!').'
' + .'' .'
'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].' ,'','','','') .'
' @@ -325,7 +259,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.', @@ -335,11 +269,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'); @@ -370,27 +303,40 @@ sub handler { return OK; } - my ($key,$firsturl,$rolestr,$symbstr,$iptokenstr)=split(/&/,$tmpinfo); + my ($key,$firsturl,$rolestr,$symbstr)=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); } - if ($iptokenstr =~ /^iptoken=/) { - (undef,$form{'iptoken'}) = split('=',$iptokenstr); + + 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)))); - my $upass = &Apache::loncommon::des_decrypt($key,$form{'upass0'}); + $chunk=substr($chunk,1,ord(substr($chunk,0,1))); + $upass.=$chunk; + } # ---------------------------------------------------------------- Authenticate @@ -421,8 +367,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 = @@ -451,81 +396,22 @@ 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'},$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 { @@ -533,51 +419,18 @@ sub handler { } } - my ($is_balancer,$otherserver); + my ($is_balancer,$otherserver) = + &Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'}); - 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($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) { + if (!$otherserver) { + ($otherserver) = &Apache::lonnet::choose_server($form{'udom'}); } - } - - if (($is_balancer) && (!$hosthere)) { 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; @@ -587,20 +440,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; @@ -632,9 +473,6 @@ sub handler { return OK; } } - if (($is_balancer) && ($hosthere)) { - $form{'noloadbalance'} = $hosthere; - } &success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,undef, \%form); return OK;