Diff for /loncom/auth/lonauth.pm between versions 1.1.1.1 and 1.6

version 1.1.1.1, 1999/10/13 17:48:52 version 1.6, 2000/05/31 13:27:28
Line 1 Line 1
 # The LearningOnline Network  # The LearningOnline Network
 # 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 Gerd Kortemeyer  # 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,
   # 1/14,2/24,2/28,2/29,3/7,5/29,5/30 Gerd Kortemeyer
   
 package Apache::lonauth;  package Apache::lonauth;
   
Line 13  use Apache::lonnet(); Line 15  use Apache::lonnet();
 # ------------------------------------------------------------ Successful login  # ------------------------------------------------------------ Successful login
   
 sub success {  sub success {
     my ($r, $lowerurl, $username, $domain, $authhost) = @_;      my ($r, $username, $domain, $authhost,$lowerurl) = @_;
     my $lonids=$r->dir_config('lonIDsDir');      my $lonids=$r->dir_config('lonIDsDir');
 # See if old ID present, but overlooked  
   # See if old ID present, if so, remove
     my $cookie;      my $cookie;
     if ($cookie=<$lonids/$username\_*\_$domain\_$authhost.id>) {      while ($cookie=<$lonids/$username\_*\_$domain\_$authhost.id>) {
  $cookie=~s/\.id//;   unlink($cookie);
         $cookie=~s/$lonids\///;      }
     } else {  
         my $now=time;  # Give them a new cookie
         $cookie="$username\_$now\_$domain\_$authhost";  
         {      my $now=time;
     my $idf=Apache::File->new(">$lonids/$cookie.id");      $cookie="$username\_$now\_$domain\_$authhost";
             print $idf "Name: $username\n";  
   # Initialize roles
   
       my $userroles=Apache::lonnet::rolesinit($domain,$username,$authhost);
   
   #  Check browser type and MathML capability
   
       my @browsertype=split(/\&/,$r->dir_config("lonBrowsDet"));
       my %mathcap=split(/\&/,$r->dir_config("lonMathML"));
       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/) { $clientos='win'; }
   
   # Write first profile
   
          {
       my $idf=Apache::File->new(">$lonids/$cookie.id");
               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";
               if ($userroles ne '') { print $idf "$userroles" };
           }
   
   # ------------------------------------------------------------ Get cookie ready
   
     $cookie="lonID=$cookie; path=/";      $cookie="lonID=$cookie; path=/";
   
   # ------------------------------------------------- Output for successful login
   
     $r->send_cgi_header(<<ENDHEADER);      $r->send_cgi_header(<<ENDHEADER);
 Content-type: text/html  Content-type: text/html
 Set-cookie: $cookie  Set-cookie: $cookie
Line 37  ENDHEADER Line 91  ENDHEADER
     $r->print(<<ENDSUCCESS);      $r->print(<<ENDSUCCESS);
 <html>  <html>
 <head>  <head>
 <title>Successful Login to the LearningOnline Network</title>  <title>Successful Login to the LearningOnline Network with CAPA</title>
   <meta HTTP-EQUIV="Refresh" CONTENT="1; url=$lowerurl">
 </head>  </head>
 <frameset rows="80,*" border=0>  <body bgcolor="#FFFFFF">
 <frame scrolling="no" name="loncontrol" src="/adm/menu">  <h1>Welcome!</h1>
 <frame name="loncontent" src="$lowerurl">  </body>
 </frameset>  
 </html>  </html>
 ENDSUCCESS  ENDSUCCESS
 }  }
Line 58  ENDFHEADER Line 112  ENDFHEADER
     $r->print(<<ENDFAILED);      $r->print(<<ENDFAILED);
 <html>  <html>
 <head>  <head>
 <title>Unsuccessful Login to the LearningOnline Network</title>  <title>Unsuccessful Login to the LearningOnline Network with CAPA</title>
 </head>  </head>
 <html>  <html>
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF">
 <h1>Sorry ...</h1>  <h1>Sorry ...</h1>
 <h2>$message to use the Learning<i>Online</i> Network</h2>  <h2>$message to use the Learning<i>Online</i> Network with CAPA</h2>
 </body>  </body>
 </html>  </html>
 ENDFAILED  ENDFAILED
Line 88  sub handler { Line 142  sub handler {
         return OK;          return OK;
     }      }
     $FORM{'uname'} =~ s/\W//g;      $FORM{'uname'} =~ s/\W//g;
     $FORM{'upass'} =~ s/\W//g;  
     $FORM{'udom'}  =~ s/\W//g;      $FORM{'udom'}  =~ s/\W//g;
   
     my $role   = $r->dir_config('lonRole');      my $role   = $r->dir_config('lonRole');
Line 112  sub handler { Line 165  sub handler {
     if (!$lonurl) { failed($r,'Cookies need to be activated'); return OK; }      if (!$lonurl) { failed($r,'Cookies need to be activated'); return OK; }
     my $lowerurl=$lonurl->value;      my $lowerurl=$lonurl->value;
   
     success($r,$lowerurl,$FORM{'uname'},$FORM{'udom'},$authhost);      success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$lowerurl);
     return OK;      return OK;
 }  }
   

Removed from v.1.1.1.1  
changed lines
  Added in v.1.6


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