[BACK]Return to lonauth.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonauth.pm between versions 1.16 and 1.26

version 1.16, 2000/10/30 22:41:55 version 1.26, 2001/10/08 22:37:50
Line 3 Line 3
 # 5/21/99,5/22,5/25,5/26,5/27,5/29,6/2,6/11,6/14,6/15  # 5/21/99,5/22,5/25,5/26,5/27,5/29,6/2,6/11,6/14,6/15
 # 16/11,12/16,  # 16/11,12/16,
 # 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 Gerd Kortemeyer  # 7/1,7/10,10/2,10/5,10/9,10/26,10/30,11/10,
   # 05/28,05/29 Gerd Kortemeyer
   # 07/24 Scott Harrison
   # 07/28,08/03 Gerd Kortemeyer
   # 8/15 Scott Harrison
   # 8/20 Gerd Kortemeyer
   
 package Apache::lonauth;  package Apache::lonauth;
   
   use strict;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::File;  use Apache::File;
 use CGI qw(:standard);  use CGI qw(:standard);
 use CGI::Cookie();  use CGI::Cookie();
   use DynaLoader; # for Crypt::DES version
 use Crypt::DES;  use Crypt::DES;
 use Apache::lonnet();  use Apache::lonnet();
 use Apache::lonmenu();  use Apache::lonmenu();
   use Fcntl qw(:flock);
 # ------------------------------------------------------------ Successful login  # ------------------------------------------------------------ Successful login
   
 sub success {  sub success {
Line 22  sub success { Line 29  sub success {
     my $lonids=$r->dir_config('lonIDsDir');      my $lonids=$r->dir_config('lonIDsDir');
   
 # See if old ID present, if so, remove  # See if old ID present, if so, remove
     my $cookie;  
     while ($cookie=<$lonids/$username\_*\_$domain\_$authhost.id>) {      my $filename;
  unlink($cookie);      opendir(DIR,$lonids);
       while ($filename=readdir(DIR)) {
          if ($filename=~/^$username\_\d+\_$domain\_$authhost\.id$/) {
     unlink($lonids.'/'.$filename);
          }
     }      }
       closedir(DIR);
   
 # Give them a new cookie  # Give them a new cookie
   
       my $cookie;
     my $now=time;      my $now=time;
     $cookie="$username\_$now\_$domain\_$authhost";      $cookie="$username\_$now\_$domain\_$authhost";
   
Line 82  sub success { Line 95  sub success {
   
        {         {
     my $idf=Apache::File->new(">$lonids/$cookie.id");      my $idf=Apache::File->new(">$lonids/$cookie.id");
       unless (flock($idf,LOCK_EX)) {
         &Apache::lonnet::logthis("<font color=blue>WARNING: ".
       'Could not obtain exclusive lock in lonauth: '.$!);
         $idf->close();
         return 'error: '.$!;
       }
             if ($userenv ne '') { print $idf "$userenv\n"; }              if ($userenv ne '') { print $idf "$userenv\n"; }
             print $idf "user.name=$username\n";              print $idf "user.name=$username\n";
             print $idf "user.domain=$domain\n";              print $idf "user.domain=$domain\n";
Line 96  sub success { Line 115  sub success {
             print $idf "request.role=cm\n";              print $idf "request.role=cm\n";
             print $idf "request.host=$ENV{'HTTP_HOST'}\n";               print $idf "request.host=$ENV{'HTTP_HOST'}\n"; 
             if ($userroles ne '') { print $idf "$userroles"; }              if ($userroles ne '') { print $idf "$userroles"; }
       $idf->close();
         }          }
            $ENV{'request.role'}='cm';
 # -------------------------------------------------------------------- Log this  # -------------------------------------------------------------------- Log this
   
     &Apache::lonnet::log($domain,$username,$authhost,      &Apache::lonnet::log($domain,$username,$authhost,
Line 105  sub success { Line 125  sub success {
   
 # ------------------------------------------------- Check for critical messages  # ------------------------------------------------- Check for critical messages
   
     my @what=&Apache::lonnet::dump('critical');      my @what=&Apache::lonnet::dump('critical',$domain,$username);
     if ($what[0]) {      if ($what[0]) {
  if ($what[0] ne 'con_lost') {   if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) {
     $lowerurl='/adm/email/critical/'.$what[0];      $lowerurl='/adm/email?critical=display';
         }          }
     }      }
   
Line 116  sub success { Line 136  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();
   # ------------------------------------------------------------- Info for Remote
       my $configmenu=&Apache::lonmenu::rawconfig();
 # ------------------------------------------------- Output for successful login  # ------------------------------------------------- Output for successful login
   
     $r->send_cgi_header(<<ENDHEADER);      $r->send_cgi_header(<<ENDHEADER);
Line 129  ENDHEADER Line 150  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>
 <meta HTTP-EQUIV="Refresh" CONTENT="1; url=$lowerurl">  <script>
   
   // --------------------------------------------- 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">  <body bgcolor="#FFFFFF">
     $windowinfo  <script>
       menuloaded=0;
       tim=0;
   </script>
   $windowinfo
 <h1>Welcome!</h1>  <h1>Welcome!</h1>
   <script>
       main();
   </script>
 </body>  </body>
 </html>  </html>
 ENDSUCCESS  ENDSUCCESS
Line 202  sub handler { Line 260  sub handler {
   
     my $keybin=pack("H16",$key);      my $keybin=pack("H16",$key);
   
     my $cipher=new DES $keybin;      my $cipher;
       if ($Crypt::DES::VERSION>=2.03) {
    $cipher=new Crypt::DES $keybin;
       }
       else {
    $cipher=new DES $keybin;
       }
   
     my $upass=$cipher->decrypt(      my $upass=$cipher->decrypt(
        unpack("a8",pack("H16",substr($FORM{'upass'},0,16))));         unpack("a8",pack("H16",substr($FORM{'upass'},0,16))));
Line 225  sub handler { Line 289  sub handler {
     }      }
   
     if (($firsturl eq '') || ($firsturl eq '/adm/logout')) {      if (($firsturl eq '') || ($firsturl eq '/adm/logout')) {
  $firsturl='/res/adm/pages/index.html';   $firsturl='/adm/roles';
     }      }
   
     success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$firsturl);      success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$firsturl);
Removed from v.1.16  
changed lines
  Added in v.1.26

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