--- loncom/auth/lonauth.pm 2003/02/20 01:35:27 1.40 +++ loncom/auth/lonauth.pm 2003/07/17 15:24:46 1.54 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.40 2003/02/20 01:35:27 www Exp $ +# $Id: lonauth.pm,v 1.54 2003/07/17 15:24:46 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,6 +42,7 @@ use CGI qw(:standard); use CGI::Cookie(); use DynaLoader; # for Crypt::DES version use Crypt::DES; +use Apache::loncommon(); use Apache::lonnet(); use Apache::lonmenu(); use Fcntl qw(:flock); @@ -77,48 +78,21 @@ sub success { # ------------------------------------ Check browser type and MathML capability - my @browsertype=split(/\&/,$r->dir_config("lonBrowsDet")); - my %mathcap=split(/\&/,$r->dir_config("lonMathML")); - my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; - my $i; - my $clientbrowser='unknown'; - my $clientversion='0'; - my $clientmathml=''; - my $clientunicode='0'; - for ($i=0;$i<=$#browsertype;$i++) { - my ($bname,$match,$notmatch,$vreg,$minv,$univ)=split(/\:/,$browsertype[$i]); - if (($httpbrowser=~/$match/i) && ($httpbrowser!~/$notmatch/i)) { - $clientbrowser=$bname; - $httpbrowser=~/$vreg/i; - $clientversion=$1; - $clientmathml=($clientversion>=$minv); - $clientunicode=($clientversion>=$univ); - } - } - my $clientos='unknown'; - if (($httpbrowser=~/linux/i) || - ($httpbrowser=~/unix/i) || - ($httpbrowser=~/ux/i) || - ($httpbrowser=~/solaris/i)) { $clientos='unix'; } - if (($httpbrowser=~/vax/i) || - ($httpbrowser=~/vms/i)) { $clientos='vms'; } - if ($httpbrowser=~/next/i) { $clientos='next'; } - if (($httpbrowser=~/mac/i) || - ($httpbrowser=~/powerpc/i)) { $clientos='mac'; } - if ($httpbrowser=~/win/i) { $clientos='win'; } - if ($httpbrowser=~/embed/i) { $clientos='pda'; } + my ($httpbrowser,$clientbrowser,$clientversion,$clientmathml, + $clientunicode,$clientos) = &Apache::loncommon::decode_user_agent($r); # -------------------------------------- Any accessibility options to remember? if (($FORM{'interface'}) && ($FORM{'remember'} eq 'true')) { - foreach ('imagesuppress','appletsuppress', - 'embedsuppress','fontenhance','blackwhite') { - if ($FORM{$_} eq 'true') { - &Apache::lonnet::put('environment',{$_ => 'on'},$domain,$username); - } else { - &Apache::lonnet::del('environment',[$_],$domain,$username); - } - } - } + foreach ('imagesuppress','appletsuppress', + 'embedsuppress','fontenhance','blackwhite') { + if ($FORM{$_} eq 'true') { + &Apache::lonnet::put('environment',{$_ => 'on'}, + $domain,$username); + } else { + &Apache::lonnet::del('environment',[$_],$domain,$username); + } + } + } # ------------------------------------------------------------- Get environment my $userenv; @@ -132,49 +106,60 @@ sub success { if (($userenv{'interface'}) && (!$FORM{'interface'})) { $FORM{'interface'}=$userenv{'interface'}; } + $ENV{'environment.remote'}=$userenv{'remote'}; +# --------------- Do not trust query string to be put directly into environment + foreach ('imagesuppress','appletsuppress', + 'embedsuppress','fontenhance','blackwhite', + 'interface','localpath','localres') { + $FORM{$_}=~s/[\n\r\=]//gs; + } # --------------------------------------------------------- Write first profile - { - my $idf=Apache::File->new(">$lonids/$cookie.id"); - unless (flock($idf,LOCK_EX)) { - &Apache::lonnet::logthis("WARNING: ". - 'Could not obtain exclusive lock in lonauth: '.$!); - $idf->close(); - return 'error: '.$!; - } - if ($userenv ne '') { print $idf "$userenv\n"; } - print $idf "user.name=$username\n"; - print $idf "user.domain=$domain\n"; - print $idf "user.home=$authhost\n"; - print $idf "browser.type=$clientbrowser\n"; - print $idf "browser.version=$clientversion\n"; - print $idf "browser.mathml=$clientmathml\n"; - print $idf "browser.unicode=$clientunicode\n"; - print $idf "browser.os=$clientos\n"; - print $idf "request.course.fn=\n"; - print $idf "request.course.uri=\n"; - print $idf "request.course.sec=\n"; - print $idf "request.role=cm\n"; - print $idf "request.host=$ENV{'HTTP_HOST'}\n"; - if ($FORM{'interface'}) { - $FORM{'interface'}=~s/\W//gs; - print $idf "browser.interface=$FORM{'interface'}\n"; - $ENV{'browser.interface'}=$FORM{'interface'}; - foreach - ('imagesuppress','appletsuppress', - 'embedsuppress','fontenhance','blackwhite') { - if (($FORM{$_} eq 'true') || - ($userenv{$_} eq 'on')) { - print $idf "browser.$_=on\n"; - } - - } - } - if ($userroles ne '') { print $idf "$userroles"; } + { + my $idf=Apache::File->new(">$lonids/$cookie.id"); + unless (flock($idf,LOCK_EX)) { + &Apache::lonnet::logthis("WARNING: ". + 'Could not obtain exclusive lock in lonauth: '.$!); $idf->close(); + return 'error: '.$!; + } + if ($userenv ne '') { print $idf "$userenv\n"; } + print $idf "user.name=$username\n"; + print $idf "user.domain=$domain\n"; + print $idf "user.home=$authhost\n"; + print $idf "browser.type=$clientbrowser\n"; + print $idf "browser.version=$clientversion\n"; + print $idf "browser.mathml=$clientmathml\n"; + print $idf "browser.unicode=$clientunicode\n"; + print $idf "browser.os=$clientos\n"; + if ($FORM{'localpath'}) { + print $idf "browser.localpath=$FORM{'localpath'}\n"; + print $idf "browser.localres=$FORM{'localres'}\n"; } - $ENV{'request.role'}='cm'; - $ENV{'browser.type'}=$clientbrowser; + print $idf "request.course.fn=\n"; + print $idf "request.course.uri=\n"; + print $idf "request.course.sec=\n"; + print $idf "request.role=cm\n"; + print $idf "request.role.adv=$ENV{'user.adv'}\n"; + print $idf "request.host=$ENV{'REMOTE_ADDR'}\n"; + if ($FORM{'interface'}) { + $FORM{'interface'}=~s/\W//gs; + print $idf "browser.interface=$FORM{'interface'}\n"; + $ENV{'browser.interface'}=$FORM{'interface'}; + foreach ('imagesuppress','appletsuppress', + 'embedsuppress','fontenhance','blackwhite') { + if (($FORM{$_} eq 'true') || + ($userenv{$_} eq 'on')) { + print $idf "browser.$_=on\n"; + } + } + } + if ($userroles ne '') { print $idf "$userroles"; } + $idf->close(); + } + $ENV{'request.role'}='cm'; + $ENV{'request.role.adv'}=$ENV{'user.adv'}; + $ENV{'browser.type'}=$clientbrowser; # -------------------------------------------------------------------- Log this &Apache::lonnet::log($domain,$username,$authhost, @@ -197,6 +182,7 @@ sub success { my $startupremote=&Apache::lonmenu::startupremote($lowerurl); my $setflags=&Apache::lonmenu::setflags(); my $maincall=&Apache::lonmenu::maincall(); + my $bodytag=&Apache::loncommon::bodytag('Successful Login'); # ------------------------------------------------- Output for successful login $r->send_cgi_header(<Successful Login to the LearningOnline Network with CAPA $startupremote - +$bodytag $setflags $windowinfo

Welcome!

@@ -228,6 +214,7 @@ ENDSUCCESS sub failed { my ($r,$message) = @_; + my $bodytag=&Apache::loncommon::bodytag('Unsuccessful Login'); $r->send_cgi_header(<Unsuccessful Login to the LearningOnline Network with CAPA - +$bodytag

Sorry ...

-

$message to use the LearningOnline Network with CAPA

+

$message

+

Please log in again.

+

+Problems?

ENDFAILED @@ -252,7 +242,7 @@ sub handler { my $r = shift; my $buffer; - $r->read($buffer,$r->header_in('Content-length')); + $r->read($buffer,$r->header_in('Content-length'),0); my @pairs=split(/&/,$buffer); my $pair; my $name; my $value; undef %FORM; @@ -265,7 +255,7 @@ sub handler { } if ((!$FORM{'uname'}) || (!$FORM{'upass'}) || (!$FORM{'udom'})) { - failed($r,'Username, password and domain need to be specified'); + failed($r,'Username, password and domain need to be specified.'); return OK; } $FORM{'uname'} =~ s/\W//g; @@ -281,10 +271,14 @@ sub handler { $FORM{'serverid'}); if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) { - failed($r,'Login token missing, inaccessible or expired'); + failed($r,'Information needed to verify your login information is missing, inaccessible or expired.'); return OK; + } else { + unless (&Apache::lonnet::reply('tmpdel:'.$FORM{'logtoken'}, + $FORM{'serverid'}) eq 'ok') { + &failed($r,'Session could not be opened.'); + } } - my ($key,$firsturl)=split(/&/,$tmpinfo); my $keybin=pack("H16",$key); @@ -313,7 +307,7 @@ sub handler { # --------------------------------------------------------------------- Failed? if ($authhost eq 'no_host') { - failed($r,'Username and/or password could not be authenticated'); + failed($r,'Username and/or password could not be authenticated.'); return OK; }