--- loncom/auth/lonauth.pm 2015/01/26 22:25:41 1.121.2.13 +++ loncom/auth/lonauth.pm 2012/12/18 20:52:18 1.124 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.121.2.13 2015/01/26 22:25:41 raeburn Exp $ +# $Id: lonauth.pm,v 1.124 2012/12/18 20:52:18 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -103,14 +103,16 @@ 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. + $destination .= '&destinationurl='.$desturl. '&destsymb='.$destsymb; } else { $destsymb = &HTML::Entities::encode($destsymb,'"<>&'); - $destination .= 'destinationurl='.$destsymb; + $destination .= '&destinationurl='.$destsymb; } } if ($destination =~ m{^/adm/roles}) { @@ -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,71 +148,43 @@ 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) = @_; - (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; - } + my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef); + my $retry = '/adm/login?username='.$form->{'uname'}. + '&domain='.$form->{'udom'}; if (exists($form->{role})) { - my $role = &Apache::loncommon::cleanup_html($form->{role}); - if ($role ne '') { - $retry .= (($retry=~/\?/)?'&':'?').'role='.$role; - } + $retry .= '&role='.$form->{role}; } if (exists($form->{symb})) { - my $symb = &Apache::loncommon::cleanup_html($form->{symb}); - if ($symb ne '') { - $retry .= (($retry=~/\?/)?'&':'?').'symb='.$symb; - } + $retry .= '&symb='.$form->{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 @actions = - (&mt('Please [_1]log in again[_2].','','')); - my $loginhelp = &loginhelpdisplay($udom); + my $loginhelp = &loginhelpdisplay($form->{'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 ); } @@ -228,9 +195,9 @@ sub reroute { my ($r) = @_; &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - my $msg=''.&mt('Sorry ...').'
' + my $msg='

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

' .&mt('Please [_1]log in again[_2].'); - &Apache::loncommon::simple_error_page($r,'Rerouting',$msg,{'no_auto_mt_msg' => 1}); + &Apache::loncommon::simple_error_page($r,'Rerouting',$msg); } # ---------------------------------------------------------------- Main handler @@ -269,7 +236,7 @@ sub handler { } $r->print( $start_page - .'

'.&mt('You are already logged in!').'

' + .'

' .'

'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].' ,'','','','') .'

' @@ -292,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.', @@ -336,25 +303,19 @@ 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); @@ -406,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 = @@ -436,17 +396,6 @@ 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'}) { # ------------ see if the original user has enough privileges to pull this stunt @@ -470,12 +419,8 @@ sub handler { } } - my ($is_balancer,$otherserver); - - unless ($hosthere) { - ($is_balancer,$otherserver) = - &Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'}); - } + my ($is_balancer,$otherserver) = + &Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'}); if ($is_balancer) { if (!$otherserver) { @@ -484,17 +429,7 @@ 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 { $r->print(&noswitch()); } @@ -505,17 +440,7 @@ 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 { $r->print(&noswitch()); }