Diff for /loncom/auth/lonauth.pm between versions 1.24 and 1.33

version 1.24, 2001/08/20 12:57:02 version 1.33, 2002/11/09 22:11:17
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 17  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 57  sub success { Line 83  sub success {
     my $clientbrowser='unknown';      my $clientbrowser='unknown';
     my $clientversion='0';      my $clientversion='0';
     my $clientmathml='';      my $clientmathml='';
       my $clientunicode='0';
     for ($i=0;$i<=$#browsertype;$i++) {      for ($i=0;$i<=$#browsertype;$i++) {
         my ($bname,$match,$notmatch,$vreg,$minv)=split(/\:/,$browsertype[$i]);          my ($bname,$match,$notmatch,$vreg,$minv,$univ)=split(/\:/,$browsertype[$i]);
  if (($httpbrowser=~/$match/i)  && ($httpbrowser!~/$notmatch/i)) {   if (($httpbrowser=~/$match/i)  && ($httpbrowser!~/$notmatch/i)) {
     $clientbrowser=$bname;      $clientbrowser=$bname;
             $httpbrowser=~/$vreg/i;              $httpbrowser=~/$vreg/i;
     $clientversion=$1;      $clientversion=$1;
             $clientmathml=($clientversion>=$minv);              $clientmathml=($clientversion>=$minv);
         }              $clientunicode=($clientversion>=$univ);
    }
     }      }
     my $clientos='unknown';      my $clientos='unknown';
     if (($httpbrowser=~/linux/i) ||      if (($httpbrowser=~/linux/i) ||
Line 77  sub success { Line 105  sub success {
     if (($httpbrowser=~/mac/i) ||      if (($httpbrowser=~/mac/i) ||
         ($httpbrowser=~/powerpc/i)) { $clientos='mac'; }          ($httpbrowser=~/powerpc/i)) { $clientos='mac'; }
     if ($httpbrowser=~/win/i) { $clientos='win'; }      if ($httpbrowser=~/win/i) { $clientos='win'; }
       if ($httpbrowser=~/embed/i) { $clientos='pda'; }
   
 # ------------------------------------------------------------- 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;  
     }      }
 # --------------------------------------------------------- Write first profile  # --------------------------------------------------------- Write first profile
   
Line 107  sub success { Line 134  sub success {
             print $idf "browser.type=$clientbrowser\n";              print $idf "browser.type=$clientbrowser\n";
             print $idf "browser.version=$clientversion\n";              print $idf "browser.version=$clientversion\n";
             print $idf "browser.mathml=$clientmathml\n";              print $idf "browser.mathml=$clientmathml\n";
               print $idf "browser.unicode=$clientunicode\n";
             print $idf "browser.os=$clientos\n";              print $idf "browser.os=$clientos\n";
             print $idf "request.course.fn=\n";              print $idf "request.course.fn=\n";
             print $idf "request.course.uri=\n";              print $idf "request.course.uri=\n";
Line 117  sub success { Line 145  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 {
   
     $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  # ------------------------------------------------------------- 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 158  function checkdef() { Line 187  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 259  sub handler { Line 288  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))));

Removed from v.1.24  
changed lines
  Added in v.1.33


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