--- loncom/auth/lonauth.pm 2017/06/06 22:34:37 1.121.2.16 +++ loncom/auth/lonauth.pm 2014/10/04 02:59:32 1.135 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.121.2.16 2017/06/06 22:34:37 raeburn Exp $ +# $Id: lonauth.pm,v 1.135 2014/10/04 02:59:32 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -73,7 +73,7 @@ sub success { } # ------------------------------------------------------------ Get cookie ready - $cookie="lonID=$cookie; path=/; HttpOnly"; + $cookie="lonID=$cookie; path=/"; # -------------------------------------------------------- Menu script and info my $destination = $lowerurl; @@ -103,7 +103,9 @@ sub success { if ($destsymb =~ /___/) { # FIXME Need to deal with encrypted symbs and urls as needed. my ($map,$resid,$desturl)=split(/___/,$destsymb); - $desturl = &Apache::lonnet::clutter($desturl); + unless ($desturl=~/^(adm|editupload|public)/) { + $desturl = &Apache::lonnet::clutter($desturl); + } $desturl = &HTML::Entities::encode($desturl,'"<>&'); $destsymb = &HTML::Entities::encode($destsymb,'"<>&'); $destination .= 'destinationurl='.$desturl. @@ -118,23 +120,16 @@ 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'); @@ -153,13 +148,10 @@ 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 @@ -238,6 +230,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); @@ -355,7 +348,26 @@ sub handler { (undef,$form{'iptoken'}) = split('=',$iptokenstr); } - my $upass = &Apache::loncommon::des_decrypt($key,$form{'upass0'}); + 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; + } # ---------------------------------------------------------------- Authenticate @@ -386,8 +398,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 = @@ -454,25 +465,13 @@ sub handler { 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; - } - } - } + &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); @@ -540,9 +539,6 @@ sub handler { return OK; } } - if (($is_balancer) && ($hosthere)) { - $form{'noloadbalance'} = $hosthere; - } &success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,undef, \%form); return OK;