--- loncom/auth/lonauth.pm 2003/05/23 21:18:56 1.50 +++ loncom/auth/lonauth.pm 2003/09/20 17:44:22 1.57 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.50 2003/05/23 21:18:56 www Exp $ +# $Id: lonauth.pm,v 1.57 2003/09/20 17:44:22 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -46,6 +46,7 @@ use Apache::loncommon(); use Apache::lonnet(); use Apache::lonmenu(); use Fcntl qw(:flock); +use Apache::lonlocal; my %FORM; @@ -107,6 +108,12 @@ sub success { $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 { @@ -126,6 +133,10 @@ sub success { 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"; + } print $idf "request.course.fn=\n"; print $idf "request.course.uri=\n"; print $idf "request.course.sec=\n"; @@ -172,7 +183,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',undef,' '); + my $bodytag=&Apache::loncommon::bodytag('Successful Login'); # ------------------------------------------------- Output for successful login $r->send_cgi_header(<send_cgi_header(<print(< + +Rerouting Login to the LearningOnline Network with CAPA + + +$bodytag +

Sorry ...

+Please log in again. + + +ENDRFAILED +} + # ---------------------------------------------------------------- Main handler sub handler { my $r = shift; +# Are we re-routing? + if (-e '/home/httpd/html/lon-status/reroute.txt') { + &reroute($r); + return OK; + } + + &Apache::lonlocal::get_language_handle($r); + my $buffer; $r->read($buffer,$r->header_in('Content-length'),0); my @pairs=split(/&/,$buffer);