--- loncom/auth/lonlogin.pm 2008/12/15 11:44:46 1.113 +++ loncom/auth/lonlogin.pm 2010/08/22 21:51:11 1.139 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.113 2008/12/15 11:44:46 tempelho Exp $ +# $Id: lonlogin.pm,v 1.139 2010/08/22 21:51:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -46,7 +46,7 @@ sub handler { (join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'}, $ENV{'REDIRECT_QUERY_STRING'}), ['interface','username','domain','firsturl','localpath','localres', - 'token']); + 'token','role','symb']); if (!defined($env{'form.firsturl'})) { &Apache::lonacc::get_posted_cgi($r,['firsturl']); } @@ -72,24 +72,31 @@ sub handler { # -------------------------------- Prevent users from attempting to login twice my $handle = &Apache::lonnet::check_for_valid_session($r); - if ($handle=~/^publicuser\_/) { + 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"); - } elsif ($handle ne '') { + unlink($r->dir_config('lonIDsDir')."/$handle.id"); + } else { # Indeed, a valid token is found - my $start_page = - &Apache::loncommon::start_page('Already logged in'); - my $end_page = - &Apache::loncommon::end_page(); - $r->print( + &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); + 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]logout[_4].', - '','','','').'

' - .'

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

' + .'

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

' .$end_page ); - return OK; + return OK; + } } # ---------------------------------------------------- No valid token, continue @@ -103,13 +110,20 @@ sub handler { $env{'form.interface'}=~s/\W//g; my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; - - my $fullgraph=($env{'form.interface'} ne 'textual'); my $iconpath= &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); + my $lonhost = $r->dir_config('lonHostID'); my $domain = &Apache::lonnet::default_login_domain(); + if ($lonhost ne '') { + my $redirect = &check_loginvia($domain,$lonhost); + if ($redirect) { + $r->print($redirect); + return OK; + } + } + if (($env{'form.domain'}) && (&Apache::lonnet::domain($env{'form.domain'},'description'))) { $domain=$env{'form.domain'}; @@ -117,7 +131,6 @@ sub handler { my $role = $r->dir_config('lonRole'); my $loadlim = $r->dir_config('lonLoadLim'); my $servadm = $r->dir_config('lonAdmEMail'); - my $lonhost = $r->dir_config('lonHostID'); my $tabdir = $r->dir_config('lonTabDir'); my $include = $r->dir_config('lonIncludes'); my $expire = $r->dir_config('lonExpire'); @@ -172,8 +185,18 @@ sub handler { if ($uextkey>2147483647) { $uextkey-=4294967296; } # -------------------------------------------------------- Store away log token + my $tokenextras; + if ($env{'form.role'}) { + $tokenextras = '&role='.&escape($env{'form.role'}); + } + if ($env{'form.symb'}) { + if (!$tokenextras) { + $tokenextras = '&'; + } + $tokenextras .= '&symb='.&escape($env{'form.symb'}); + } my $logtoken=Apache::lonnet::reply( - 'tmpput:'.$ukey.$lkey.'&'.$firsturl, + 'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras, $lonhost); # ------------------- If we cannot talk to ourselves, we are in serious trouble @@ -235,24 +258,18 @@ return OK; $servadm=~s/\,/\
/g; # ----------------------------------------------------------- Front page design -my $pgbg= -($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF'); -my $font= -($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000'); -my $link= -($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF'); -my $vlink= -($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF'); +my $pgbg=&Apache::loncommon::designparm('login.pgbg',$domain); +my $font=&Apache::loncommon::designparm('login.font',$domain); +my $link=&Apache::loncommon::designparm('login.link',$domain); +my $vlink=&Apache::loncommon::designparm('login.vlink',$domain); my $alink=&Apache::loncommon::designparm('login.alink',$domain); -my $mainbg= -($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF'); +my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain); +my $loginbox_bg=&Apache::loncommon::designparm('login.sidebg',$domain); +my $loginbox_header_bgcol=&Apache::loncommon::designparm('login.bgcol',$domain); +my $loginbox_header_textcol=&Apache::loncommon::designparm('login.textcol',$domain); my $logo=&Apache::loncommon::designparm('login.logo',$domain); my $img=&Apache::loncommon::designparm('login.img',$domain); -my $domainlogo=&Apache::loncommon::domainlogo($domain); -my $login=&Apache::loncommon::designparm('login.login',$domain); -if ($login eq '') { -$login = $iconpath.'/'.&mt('userauthentication.gif'); -} +my $domainlogo='
'.&Apache::loncommon::domainlogo($domain).'
'; my $showbanner = 1; my $showmainlogo = 1; if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) { @@ -264,13 +281,13 @@ if (defined(&Apache::loncommon::designpa my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain); my $showcoursecat = &Apache::loncommon::designparm('login.coursecatalog',$domain); -my $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain); my $shownewuserlink = &Apache::loncommon::designparm('login.newuser',$domain); my $now=time; my $js = (< + ENDSCRIPT # --------------------------------------------------- Print login screen header -my %add_entries = (topmargin => "0", - leftmargin => "0", - marginheight => "0", - marginwidth => "0", +my %add_entries = ( bgcolor => "$mainbg", text => "$font", link => "$link", vlink => "$vlink", - alink => "$alink",); + alink => "$alink", + onload => 'javascript:enableInput();',); $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js, { 'redirect' => [$expire,'/adm/roles'], @@ -320,25 +344,27 @@ $r->print(&Apache::loncommon::start_page # ----------------------------------------------------------------------- Texts my %lt=&Apache::lonlocal::texthash( - 'un' => 'Username', - 'pw' => 'Password', - 'dom' => 'Domain', - 'perc' => 'percent', - 'load' => 'Server Load', - 'userload' => 'User Load', - 'about' => 'About LON-CAPA', - 'catalog' => 'Course Catalog', - 'log' => 'Log in', - 'help' => 'Log-in Help', - 'serv' => 'Server', - 'servadm' => 'Server Administration', - 'helpdesk' => 'Contact Helpdesk', - 'forgotpw' => 'Forgot password?', - 'newuser' => 'New User?', - ); + 'un' => 'Username', + 'pw' => 'Password', + 'dom' => 'Domain', + 'perc' => 'percent', + 'load' => 'Server Load', + 'userload' => 'User Load', + 'catalog' => 'Course/Community Catalog', + 'log' => 'Log in', + 'help' => 'Log-in Help', + 'serv' => 'Server', + 'servadm' => 'Server Administration', + 'helpdesk' => 'Contact Helpdesk', + 'forgotpw' => 'Forgot password?', + 'newuser' => 'New User?', + ); # -------------------------------------------------- Change password field name + my $forgotpw = &forgotpwdisplay(%lt); -my $loginhelp = &loginhelpdisplay(%lt); +$forgotpw .= '
' if $forgotpw; +my $loginhelp = &loginhelpdisplay($authdomain,%lt); +$loginhelp .= '
' if $loginhelp; # ---------------------------------------------------- Serve out DES JavaScript { @@ -347,10 +373,15 @@ $r->print(<$jsh>); } # ---------------------------------------------------------- Serve rest of page -if ($fullgraph) { $r->print( - '
'); -} + '
' +); + +# +# If the loadbalancing yielded just http:// because perhaps there's no loadbalancing? +# then just us a relative link to authenticate: +# $r->print(< @@ -367,94 +398,82 @@ $r->print(<'; } my $newuserlink; if ($shownewuserlink) { - $newuserlink = &newuser_link($lt{'newuser'}); -} -my $logintitle; -if ($loginheader eq 'text') { - $logintitle ='

'.$lt{'log'}.'

'; -} else { - $logintitle = ''. - &mt('User Authentication').''; + $newuserlink = &newuser_link($lt{'newuser'}).'
'; } +my $logintitle = + '

' + .$lt{'log'} + .'

'; my $noscript_warning=''; my $helpdeskscript; my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, - $version,$authdomain,\$helpdeskscript); + $authdomain,\$helpdeskscript); my $loginform=(< - - +
+ + :
-
+
:
-
+
:
-
+
LFORM -if ($fullgraph) { if ($showbanner) { $r->print(< - - - - -
- The Learning Online Network with CAPA -
+
+ The Learning Online Network with CAPA +
HEADER } - if ($showmainlogo) { - $r->print('
 
'."\n". - ' '."\n"); - } $r->print(<$domainlogo
-
+
+
$logintitle - - - - -
- $loginform -
- $noscript_warning + $loginform + $noscript_warning
-
- $loginhelp
- $forgotpw

- $newuserlink
- $coursecatalog

- $lt{'about'}
- $contactblock +
+ $loginhelp + $forgotpw + $contactblock + $newuserlink + $coursecatalog +
-
 
+
+ENDTOP + if ($showmainlogo) { + $r->print(' '."\n"); + } +$r->print(< +
ENDTOP -} - -if($announcements){$r->print('
 
');} -if ($fullgraph) { $r->print(< + + + +
-    $lt{'dom'}:  + $lt{'dom'}:   $domain @@ -462,7 +481,7 @@ $r->print(<
-    $lt{'serv'}:  + $lt{'serv'}:   $lonhost ($role) @@ -470,7 +489,7 @@ $r->print(<
-    $lt{'load'}:  + $lt{'load'}:   $loadpercent $lt{'perc'} @@ -478,30 +497,92 @@ $r->print(<
-    $lt{'userload'}:  + $lt{'userload'}:   $userloadpercent $lt{'perc'}
+ $version +
$helpdeskscript ENDDOCUMENT -} my %endargs = ( 'noredirectlink' => 1, ); $r->print(&Apache::loncommon::end_page(\%endargs)); return OK; } +sub check_loginvia { + my ($domain,$lonhost) = @_; + if ($domain eq '' || $lonhost eq '') { + return; + } + my %domconfhash = &Apache::loncommon::get_domainconf($domain); + my $loginvia = $domconfhash{$domain.'.login.loginvia_'.$lonhost}; + my $loginvia_exempt = $domconfhash{$domain.'.login.loginvia_exempt_'.$lonhost}; + my $output; + if ($loginvia ne '') { + my $noredirect; + my $ip = $ENV{'REMOTE_ADDR'}; + if ($ip eq '127.0.0.1') { + $noredirect = 1; + } else { + if ($loginvia_exempt ne '') { + my @exempt = split(',',$loginvia_exempt); + if (grep(/^\Q$ip\E$/,@exempt)) { + $noredirect = 1; + } + } + } + unless ($noredirect) { + my ($newhost,$path); + if ($loginvia =~ /:/) { + ($newhost,$path) = split(':',$loginvia); + } else { + $newhost = $loginvia; + } + if ($newhost ne $lonhost) { + if (&Apache::lonnet::hostname($newhost) ne '') { + $output = &redirect_page($newhost,$path); + } + } + } + } + return $output; +} + +sub redirect_page { + my ($desthost,$path) = @_; + my $protocol = $Apache::lonnet::protocol{$desthost}; + $protocol = 'http' if ($protocol ne 'https'); + unless ($path =~ m{^/}) { + $path = '/'.$path; + } + my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).$path; + if ($env{'form.firsturl'} ne '') { + $url .='?firsturl='.$env{'form.firsturl'}; + } + my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef, + {'redirect' => [0,$url],}); + my $end_page = &Apache::loncommon::end_page(); + return $start_page.$end_page; +} + sub contactdisplay { - my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_; + my ($lt,$servadm,$showadminmail,$authdomain,$helpdeskscript) = @_; my $contactblock; my $showhelpdesk = 0; my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; @@ -509,14 +590,15 @@ sub contactdisplay { $showhelpdesk = 1; } if ($servadm && $showadminmail) { - $contactblock .= '   '.$$lt{'servadm'}.':
'. - '      '.$servadm.'
 
'; + $contactblock .= $$lt{'servadm'}.':
'. + ''.$servadm.'
'; } if ($showhelpdesk) { - $contactblock .= ''.$lt->{'helpdesk'}.'
'; + $contactblock .= ''.$lt->{'helpdesk'}.'
'; my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT"; ENDSCRIPT } - $contactblock .= <<"ENDBLOCK"; -    $version -ENDBLOCK return $contactblock; } @@ -545,10 +625,20 @@ sub forgotpwdisplay { } sub loginhelpdisplay { - my (%lt) = @_; + my ($authdomain,%lt) = @_; my $login_help = 1; if ($login_help) { - return ''.$lt{'help'}.''; + my $dom = $authdomain; + if ($dom eq '') { + $dom = &Apache::lonnet::default_login_domain(); + } + my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom); + my $loginhelp_url = $helpconfig{'helpsettings'}{'loginhelpurl'}; + if ($loginhelp_url ne '') { + return ''.$lt{'help'}.''; + } else { + return ''.$lt{'help'}.''; + } } return; } @@ -562,7 +652,7 @@ END sub newuser_link { my ($linkname) = @_; - return '   '.$linkname.'
'; + return ''.$linkname.''; } 1;