Diff for /loncom/auth/lonauth.pm between versions 1.7 and 1.8

version 1.7, 2000/06/05 20:28:17 version 1.8, 2000/06/29 20:43:03
Line 2 Line 2
 # User Authentication Module  # User Authentication Module
 # 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 Gerd Kortemeyer  # 1/14,2/24,2/28,2/29,3/7,5/29,5/30,5/31,6/1,6/5,6/29 Gerd Kortemeyer
   
 package Apache::lonauth;  package Apache::lonauth;
   
Line 10  use Apache::Constants qw(:common); Line 10  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 Crypt::DES;
 use Apache::lonnet();  use Apache::lonnet();
   
 # ------------------------------------------------------------ Successful login  # ------------------------------------------------------------ Successful login
Line 158  sub handler { Line 159  sub handler {
     my $domain = $r->dir_config('lonDefDomain');      my $domain = $r->dir_config('lonDefDomain');
     my $prodir = $r->dir_config('lonUsersDir');      my $prodir = $r->dir_config('lonUsersDir');
   
   # ---------------------------------------- Get the information from login token
   
       my $tmpinfo=Apache::lonnet::reply('tmpget:'.$FORM{'logtoken'},
                                         $FORM{'serverid'});
   
       if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {
    failed($r,'Login token missing, inaccessible or expired');
           return OK;
       }
       
       my ($key,$firsturl)=split(/:/,$tmpinfo);
   
       my $keybin=pack("H16",$key);
   
       my $cipher=new DES $keybin;
   
       my $upass=$cipher->decrypt(
          unpack("a8",pack("H16",substr($FORM{'upass'},0,16))));
   
       $upass.=$cipher->decrypt(
          unpack("a8",pack("H16",substr($FORM{'upass'},16,16))));
   
       $upass=substr($upass,1,ord(substr($upass,0,1)));
   
 # ---------------------------------------------------------------- Authenticate  # ---------------------------------------------------------------- Authenticate
     my $authhost=Apache::lonnet::authenticate($FORM{'uname'},      my $authhost=Apache::lonnet::authenticate($FORM{'uname'},
                                               $FORM{'upass'},                                                $upass,
                                               $FORM{'udom'});                                                $FORM{'udom'});
           
 # --------------------------------------------------------------------- Failed?  # --------------------------------------------------------------------- Failed?
Line 170  sub handler { Line 195  sub handler {
         return OK;          return OK;
     }      }
   
     if ($FORM{'firsturl'} eq '') {      if ($firsturl eq '') {
  $FORM{'firsturl'}='/res/index.html';   $firsturl='/res/adm/pages/index.html';
     }      }
   
     success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$FORM{'firsturl'});      success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$firsturl);
     return OK;      return OK;
 }  }
   

Removed from v.1.7  
changed lines
  Added in v.1.8


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