Diff for /loncom/auth/lonauth.pm between versions 1.28 and 1.49

version 1.28, 2002/03/21 18:54:47 version 1.49, 2003/05/06 21:45:25
Line 30 Line 30
 # 1/14,2/24,2/28,2/29,3/7,5/29,5/30,5/31,6/1,6/5,6/29,  # 1/14,2/24,2/28,2/29,3/7,5/29,5/30,5/31,6/1,6/5,6/29,
 # 7/1,7/10,10/2,10/5,10/9,10/26,10/30,11/10,  # 7/1,7/10,10/2,10/5,10/9,10/26,10/30,11/10,
 # 05/28,05/29 Gerd Kortemeyer  # 05/28,05/29 Gerd Kortemeyer
 # 07/24 Scott Harrison  
 # 07/28,08/03 Gerd Kortemeyer  # 07/28,08/03 Gerd Kortemeyer
 # 8/15 Scott Harrison  
 # 8/20 Gerd Kortemeyer  # 8/20 Gerd Kortemeyer
   
 package Apache::lonauth;  package Apache::lonauth;
Line 44  use CGI qw(:standard); Line 42  use CGI qw(:standard);
 use CGI::Cookie();  use CGI::Cookie();
 use DynaLoader; # for Crypt::DES version  use DynaLoader; # for Crypt::DES version
 use Crypt::DES;  use Crypt::DES;
   use Apache::loncommon();
 use Apache::lonnet();  use Apache::lonnet();
 use Apache::lonmenu();  use Apache::lonmenu();
 use Fcntl qw(:flock);  use Fcntl qw(:flock);
   
   my %FORM;
   
 # ------------------------------------------------------------ Successful login  # ------------------------------------------------------------ Successful login
   
 sub success {  sub success {
Line 76  sub success { Line 78  sub success {
   
 # ------------------------------------ Check browser type and MathML capability  # ------------------------------------ Check browser type and MathML capability
   
     my @browsertype=split(/\&/,$r->dir_config("lonBrowsDet"));      my ($httpbrowser,$clientbrowser,$clientversion,$clientmathml,
     my %mathcap=split(/\&/,$r->dir_config("lonMathML"));          $clientunicode,$clientos) = &Apache::loncommon::decode_user_agent($r);
     my $httpbrowser=$ENV{"HTTP_USER_AGENT"};  
     my $i;  
     my $clientbrowser='unknown';  
     my $clientversion='0';  
     my $clientmathml='';  
     for ($i=0;$i<=$#browsertype;$i++) {  
         my ($bname,$match,$notmatch,$vreg,$minv)=split(/\:/,$browsertype[$i]);  
  if (($httpbrowser=~/$match/i)  && ($httpbrowser!~/$notmatch/i)) {  
     $clientbrowser=$bname;  
             $httpbrowser=~/$vreg/i;  
     $clientversion=$1;  
             $clientmathml=($clientversion>=$minv);  
         }  
     }  
     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'; }  
   
   # -------------------------------------- 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);
       }
    }
       }
 # ------------------------------------------------------------- Get environment  # ------------------------------------------------------------- Get environment
   
     my $userenv=Apache::lonnet::reply("dump:$domain:$username:environment",      my $userenv;
                                       $authhost);      my %userenv=Apache::lonnet::dump('environment',$domain,$username);
     if (($userenv eq 'con_lost') ||       my ($tmp) = keys(%userenv);
         ($userenv =~ /^error\:/)) {      if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
         $userenv='';   foreach my $key (keys(%userenv)) {
     }      $userenv.="environment.$key=$userenv{$key}\n";
     $userenv=~s/\&/\nenvironment\./g;   }
     if ($userenv ne '') {  
  $userenv='environment.'.$userenv;  
     }      }
       if (($userenv{'interface'}) && (!$FORM{'interface'})) {
    $FORM{'interface'}=$userenv{'interface'};
       }
       $ENV{'environment.remote'}=$userenv{'remote'};
 # --------------------------------------------------------- Write first profile  # --------------------------------------------------------- Write first profile
   
        {      {
     my $idf=Apache::File->new(">$lonids/$cookie.id");   my $idf=Apache::File->new(">$lonids/$cookie.id");
     unless (flock($idf,LOCK_EX)) {   unless (flock($idf,LOCK_EX)) {
       &Apache::lonnet::logthis("<font color=blue>WARNING: ".      &Apache::lonnet::logthis("<font color=blue>WARNING: ".
     'Could not obtain exclusive lock in lonauth: '.$!);     '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.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 ($userroles ne '') { print $idf "$userroles"; }  
     $idf->close();      $idf->close();
         }      return 'error: '.$!;
          $ENV{'request.role'}='cm';   }
          $ENV{'browser.type'}=$clientbrowser;   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.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  # -------------------------------------------------------------------- Log this
   
     &Apache::lonnet::log($domain,$username,$authhost,      &Apache::lonnet::log($domain,$username,$authhost,
Line 162  sub success { Line 168  sub success {
   
     $cookie="lonID=$cookie; path=/";      $cookie="lonID=$cookie; path=/";
 # -------------------------------------------------------- Menu script and info  # -------------------------------------------------------- Menu script and info
     my $windowinfo=&Apache::lonmenu::open();      my $windowinfo=&Apache::lonmenu::open($clientos);
 # ------------------------------------------------------------- Info for Remote      my $startupremote=&Apache::lonmenu::startupremote($lowerurl);
     my $configmenu=&Apache::lonmenu::rawconfig();      my $setflags=&Apache::lonmenu::setflags();
       my $maincall=&Apache::lonmenu::maincall();
       my $bodytag=&Apache::loncommon::bodytag('Successful Login');
 # ------------------------------------------------- Output for successful login  # ------------------------------------------------- Output for successful login
   
     $r->send_cgi_header(<<ENDHEADER);      $r->send_cgi_header(<<ENDHEADER);
Line 176  ENDHEADER Line 184  ENDHEADER
 <html>  <html>
 <head>  <head>
 <title>Successful Login to the LearningOnline Network with CAPA</title>  <title>Successful Login to the LearningOnline Network with CAPA</title>
 <script>  $startupremote
   
 // --------------------------------------------- Checks if server frame defined  
   
 function checkdef() {  
    if ((menuloaded==0) && (tim==0)) { setTimeout('checkdef()',100); }  
 }  
   
 // ---------------------------------------------------------- The wait function  
   
 function wait() {  
    if ((menuloaded==1) || (tim==1)) {  
       if (tim==0) {  
          clearTimeout(canceltim);  
          $configmenu  
          window.location='$lowerurl';    
       } else {  
          alert("Remote Control Timed Out.");  
       }  
    } else {  
       setTimeout('wait();',100);  
    }  
 }  
   
 function main() {  
    canceltim=setTimeout('tim=1;',80000);  
    checkdef();  
    wait();  
 }  
   
 </script>  
 </head>  </head>
 <body bgcolor="#FFFFFF">  $bodytag
 <script>  $setflags
     menuloaded=0;  
     tim=0;  
 </script>  
 $windowinfo  $windowinfo
 <h1>Welcome!</h1>  <h1>Welcome!</h1>
 <script>  Welcome to the Learning<i>Online</i> Network with CAPA.
     main();  Please wait while your session
 </script>  is being set up.<p>
   <a href="/adm/loginproblems.html">Problems?</a></p>
   $maincall
 </body>  </body>
 </html>  </html>
 ENDSUCCESS  ENDSUCCESS
Line 227  ENDSUCCESS Line 204  ENDSUCCESS
   
 sub failed {  sub failed {
     my ($r,$message) = @_;      my ($r,$message) = @_;
       my $bodytag=&Apache::loncommon::bodytag('Unsuccessful Login');
     $r->send_cgi_header(<<ENDFHEADER);      $r->send_cgi_header(<<ENDFHEADER);
 Content-type: text/html  Content-type: text/html
   
Line 237  ENDFHEADER Line 215  ENDFHEADER
 <title>Unsuccessful Login to the LearningOnline Network with CAPA</title>  <title>Unsuccessful Login to the LearningOnline Network with CAPA</title>
 </head>  </head>
 <html>  <html>
 <body bgcolor="#FFFFFF">  $bodytag
 <h1>Sorry ...</h1>  <h1>Sorry ...</h1>
 <h2>$message to use the Learning<i>Online</i> Network with CAPA</h2>  <p><b>$message</b></p>
   <p>Please <a href="/adm/login?username=$FORM{'uname'}&domain=$FORM{'udom'}">log in again</a>.</p>
   <p>
   <a href="/adm/loginproblems.html">Problems?</a></p>
 </body>  </body>
 </html>  </html>
 ENDFAILED  ENDFAILED
Line 251  sub handler { Line 232  sub handler {
     my $r = shift;      my $r = shift;
   
     my $buffer;      my $buffer;
     $r->read($buffer,$r->header_in('Content-length'));      $r->read($buffer,$r->header_in('Content-length'),0);
     my @pairs=split(/&/,$buffer);      my @pairs=split(/&/,$buffer);
     my $pair; my $name; my $value; my %FORM;      my $pair; my $name; my $value;
       undef %FORM;
       %FORM=();
     foreach $pair (@pairs) {      foreach $pair (@pairs) {
        ($name,$value) = split(/=/,$pair);         ($name,$value) = split(/=/,$pair);
        $value =~ tr/+/ /;         $value =~ tr/+/ /;
Line 262  sub handler { Line 245  sub handler {
     }       } 
   
     if ((!$FORM{'uname'}) || (!$FORM{'upass'}) || (!$FORM{'udom'})) {      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;          return OK;
     }      }
     $FORM{'uname'} =~ s/\W//g;      $FORM{'uname'} =~ s/\W//g;
Line 278  sub handler { Line 261  sub handler {
                                       $FORM{'serverid'});                                        $FORM{'serverid'});
   
     if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {      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;          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 ($key,$firsturl)=split(/&/,$tmpinfo);
   
     my $keybin=pack("H16",$key);      my $keybin=pack("H16",$key);
Line 310  sub handler { Line 297  sub handler {
 # --------------------------------------------------------------------- Failed?  # --------------------------------------------------------------------- Failed?
   
     if ($authhost eq 'no_host') {      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;          return OK;
     }      }
   

Removed from v.1.28  
changed lines
  Added in v.1.49


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>