--- loncom/auth/lonauth.pm 2010/09/15 18:28:45 1.101.10.1 +++ loncom/auth/lonauth.pm 2010/07/24 17:42:46 1.107 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.101.10.1 2010/09/15 18:28:45 raeburn Exp $ +# $Id: lonauth.pm,v 1.107 2010/07/24 17:42:46 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -111,23 +111,16 @@ sub success { } } - 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'); @@ -142,13 +135,10 @@ sub success { ); $r->print(<$lt{'wel'} $lt{'mes'}

$lt{'pro'}

-$remoteinfo -$maincall $continuelink $end_page ENDSUCCESS @@ -158,8 +148,7 @@ ENDSUCCESS sub failed { my ($r,$message,$form) = @_; - my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef, - {'no_inline_link' => 1,}); + my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef); my $retry = '/adm/login?username='.$form->{'uname'}. '&domain='.$form->{'udom'}; if (exists($form->{role})) { @@ -209,23 +198,33 @@ sub handler { # -------------------------------- Prevent users from attempting to login twice my $handle = &Apache::lonnet::check_for_valid_session($r); if ($handle ne '') { + my $lonidsdir=$r->dir_config('lonIDsDir'); + if ($handle=~/^publicuser\_/) { +# For "public user" - remove it, we apparently really want to login + unlink($r->dir_config('lonIDsDir')."/$handle.id"); + } else { # Indeed, a valid token is found - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - my $start_page = - &Apache::loncommon::start_page('Already logged in'); - my $end_page = - &Apache::loncommon::end_page(); - $r->print( - $start_page - .'

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

' - .'

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

' - .'

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

' - .$end_page - ); - return OK; + &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + my $start_page = + &Apache::loncommon::start_page('Already logged in'); + my $end_page = + &Apache::loncommon::end_page(); + my $dest = '/adm/roles'; + if ($env{'form.firsturl'} ne '') { + $dest = $env{'form.firsturl'}; + } + $r->print( + $start_page + .'

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

' + .'

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

' + .$end_page + ); + return OK; + } } # ---------------------------------------------------- No valid token, continue @@ -336,35 +335,45 @@ sub handler { if (grep(/^login$/,@cancreate)) { $defaultauth = 1; } - my $uname = $form{'uname'}; - my $authhost=Apache::lonnet::authenticate($uname,$upass, - $form{'udom'},$defaultauth); + my $clientcancheckhost = 1; + my $authhost=Apache::lonnet::authenticate($form{'uname'},$upass, + $form{'udom'},$defaultauth, + $clientcancheckhost); # --------------------------------------------------------------------- Failed? if ($authhost eq 'no_host') { - my $lc_uname = lc($form{'uname'}); - if ($uname eq $lc_uname) { - &failed($r,'Username and/or password could not be authenticated.', - \%form); + &failed($r,'Username and/or password could not be authenticated.', + \%form); + return OK; + } elsif ($authhost eq 'no_account_on_host') { + my %domconfig = + &Apache::lonnet::get_dom('configuration',['usercreation'],$form{'udom'}); + if (grep(/^login$/,@cancreate)) { + my $domdesc = &Apache::lonnet::domain($form{'udom'},'description'); + &check_can_host($r,\%form,'no_account_on_host',$domdesc); + my $start_page = + &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 = + &Apache::loncommon::build_recipient_list(undef,'helpdeskmail', + $form{'udom'},$origmail); + my ($contact_email) = split(',',$contacts); + my $output = &Apache::createaccount::username_check($form{'uname'}, + $form{'udom'},$domdesc,'', + $lonhost,$contact_email,$contact_name); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + &Apache::createaccount::print_header($r,$start_page); + $r->print('

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

'. + &mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account at this institution.').'
'. + $output.&Apache::loncommon::end_page()); return OK; } else { - $authhost=Apache::lonnet::authenticate($lc_uname,$upass, - $form{'udom'},$defaultauth); - if ($authhost eq 'no_host') { - &failed($r,'Username (in lower case) and/or password could not be authenticated.', - \%form); - return OK; - } elsif ($authhost eq 'no_account_on_host') { - &create_account($r,\%form,\@cancreate,$lc_uname,$contact_name); - return OK; - } else { - $form{'uname'} = $lc_uname; - } + &failed($r,'Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.',\%form); + return OK; } - } elsif ($authhost eq 'no_account_on_host') { - &create_account($r,\%form,\@cancreate,$uname); - return OK; } if (($firsturl eq '') || @@ -394,10 +403,13 @@ sub handler { } } + &check_can_host($r,\%form,$authhost); + if ($r->dir_config("lonBalancer") eq 'yes') { &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef, \%form); - $r->internal_redirect('/adm/switchserver'); + my ($otherserver) = &Apache::lonnet::choose_server($form{'udom'}); + $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver); } else { &success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,undef, \%form); @@ -405,36 +417,62 @@ sub handler { return OK; } -sub create_account { - my ($r,$form,$cancreate,$uname,$contact_name) = @_; - return unless((ref($form) eq 'HASH') && (ref($cancreate) eq 'ARRAY')); - my %domconfig = - &Apache::lonnet::get_dom('configuration',['usercreation'],$form->{'udom'}); - if (grep(/^login$/,@{$cancreate})) { - my $start_page = - &Apache::loncommon::start_page('Create a user account in LON-CAPA', - '',{'no_inline_link' => 1,}); - my $domdesc = &Apache::lonnet::domain($form->{'udom'},'description'); - my $lonhost = $r->dir_config('lonHostID'); - my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; - my $contacts = - &Apache::loncommon::build_recipient_list(undef,'helpdeskmail', - $form->{'udom'},$origmail); - my ($contact_email) = split(',',$contacts); - my $output = - &Apache::createaccount::username_check($uname,$form->{'udom'}, - $domdesc,'',$lonhost, - $contact_email,$contact_name); - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - &Apache::createaccount::print_header($r,$start_page); - $r->print('

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

'. - &mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account at this institution.').'
'. - $output.&Apache::loncommon::end_page()); - } else { - &failed($r,'Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.',$form); +sub check_can_host { + my ($r,$form,$authhost,$domdesc) = @_; + return unless (ref($form) eq 'HASH'); + my $canhost = 1; + my $lonhost = $r->dir_config('lonHostID'); + my $udom = $form->{'udom'}; + my @intdoms = &Apache::lonnet::get_internet_names($lonhost); + my $uprimary_id = &Apache::lonnet::domain($udom,'primary'); + my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id); + unless ($uint_dom ne '' && grep(/^\Q$uint_dom\E$/,@intdoms)) { + my $machine_dom = &Apache::lonnet::host_domain($lonhost); + my $hostname = &Apache::lonnet::hostname($lonhost); + my $serverhomeID = &Apache::lonnet::get_server_homeID($hostname); + my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID); + my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom); + my %udomdefaults = &Apache::lonnet::get_domain_defaults($udom); + my $loncaparev; + if ($authhost eq 'no_account_on_host') { + $loncaparev = &Apache::lonnet::get_server_loncaparev($machine_dom); + } else { + $loncaparev = &Apache::lonnet::get_server_loncaparev($machine_dom,$lonhost); + } + $canhost = &Apache::lonnet::can_host_session($udom,$lonhost,$loncaparev, + $udomdefaults{'remotesessions'}, + $defdomdefaults{'hostedsessions'}); + } + unless ($canhost) { + if ($authhost eq 'no_account_on_host') { + my ($login_host,$hostname) = &Apache::lonnet::choose_server($udom); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + if ($login_host ne '') { + my $protocol = $Apache::lonnet::protocol{$login_host}; + $protocol = 'http' if ($protocol ne 'https'); + my $newurl = $protocol.'://'.$hostname.'/adm/createaccount'; + $r->print(&Apache::loncommon::start_page('Create a user account in LON-CAPA'). + '

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

'. + &mt('You do not currently have a LON-CAPA account at this institution.').'
'. + '

'.&mt('You will be able to create one by logging into a LON-CAPA server within the [_1] domain.',$domdesc).'

'. + '

'.&mt('[_1]Log in[_2]','',''). + &Apache::loncommon::end_page()); + } else { + $r->print(&Apache::loncommon::start_page('Access to LON-CAPA unavailable'). + '

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

'. + &mt('You do not currently have a LON-CAPA account at this institution.').'
'. + '

'.&mt('Currently a LON-CAPA server is not available within the [_1] domain for you to log-in to, to create an account.',$domdesc).'

'. + &Apache::loncommon::end_page()); + } + return OK; + } else { + &success($r,$form->{'uname'},$udom,$authhost,'noredirect',undef, + $form); + my ($otherserver) = &Apache::lonnet::choose_server($udom); + $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver); + } } - return; } 1;