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

Diff for /loncom/auth/lonauth.pm between versions 1.22 and 1.30

version 1.22, 2001/08/04 00:39:32 version 1.30, 2002/05/06 21:55:25
Line 1 Line 1
 # The LearningOnline Network  # The LearningOnline Network
 # User Authentication Module  # User Authentication Module
   #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
 # 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,
Line 7 Line 32
 # 05/28,05/29 Gerd Kortemeyer  # 05/28,05/29 Gerd Kortemeyer
 # 07/24 Scott Harrison  # 07/24 Scott Harrison
 # 07/28,08/03 Gerd Kortemeyer  # 07/28,08/03 Gerd Kortemeyer
   # 8/15 Scott Harrison
   # 8/20 Gerd Kortemeyer
   
 package Apache::lonauth;  package Apache::lonauth;
   
Line 15  use Apache::Constants qw(:common); Line 42  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();
Line 115  sub success { Line 143  sub success {
     $idf->close();      $idf->close();
         }          }
          $ENV{'request.role'}='cm';           $ENV{'request.role'}='cm';
            $ENV{'browser.type'}=$clientbrowser;
 # -------------------------------------------------------------------- Log this  # -------------------------------------------------------------------- Log this
   
     &Apache::lonnet::log($domain,$username,$authhost,      &Apache::lonnet::log($domain,$username,$authhost,
Line 135  sub success { Line 164  sub success {
 # -------------------------------------------------------- Menu script and info  # -------------------------------------------------------- Menu script and info
     my $windowinfo=&Apache::lonmenu::open();      my $windowinfo=&Apache::lonmenu::open();
 # ------------------------------------------------------------- Info for Remote  # ------------------------------------------------------------- Info for Remote
     my $configmenu=&Apache::lonmenu::rawconfig();      my $configmenu=&Apache::lonmenu::rawconfig($r);
 # ------------------------------------------------- Output for successful login  # ------------------------------------------------- Output for successful login
   
     $r->send_cgi_header(<<ENDHEADER);      $r->send_cgi_header(<<ENDHEADER);
Line 156  function checkdef() { Line 185  function checkdef() {
 }  }
   
 // ---------------------------------------------------------- The wait function  // ---------------------------------------------------------- The wait function
   var canceltim;
 function wait() {  function wait() {
    if ((menuloaded==1) || (tim==1)) {     if ((menuloaded==1) || (tim==1)) {
       if (tim==0) {        if (tim==0) {
Line 172  function wait() { Line 201  function wait() {
 }  }
   
 function main() {  function main() {
    canceltim=setTimeout('tim=1;',20000);     canceltim=setTimeout('tim=1;',80000);
    checkdef();     checkdef();
    wait();     wait();
 }  }
Line 257  sub handler { Line 286  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 280  sub handler { Line 315  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.22  
changed lines
  Added in v.1.30

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