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

Diff for /loncom/auth/lonauth.pm between versions 1.36 and 1.44

version 1.36, 2003/02/03 18:03:52 version 1.44, 2003/03/02 03:58:55
Line 45  use Crypt::DES; Line 45  use Crypt::DES;
 use Apache::lonnet();  use Apache::lonnet();
 use Apache::lonmenu();  use Apache::lonmenu();
 use Fcntl qw(:flock);  use Fcntl qw(:flock);
   
   my %FORM;
   
 # ------------------------------------------------------------ Successful login  # ------------------------------------------------------------ Successful login
   
 sub success {  sub success {
Line 105  sub success { Line 108  sub success {
     if ($httpbrowser=~/win/i) { $clientos='win'; }      if ($httpbrowser=~/win/i) { $clientos='win'; }
     if ($httpbrowser=~/embed/i) { $clientos='pda'; }      if ($httpbrowser=~/embed/i) { $clientos='pda'; }
   
   # -------------------------------------- Any accessibility options to remember?
       if (($FORM{'interface'}) && ($FORM{'remember'} eq 'true')) {
    foreach ('imagesuppress','appletsuppress',
    'embedsuppress','fontenhance','blackwhite') {
       if ($FORM{$_} eq 'true') {
    &Apache::lonnet::put('environment',{$_ => 'on'},
        $domain,$username);
       } else {
    &Apache::lonnet::del('environment',[$_],$domain,$username);
       }
    }
       }
 # ------------------------------------------------------------- Get environment  # ------------------------------------------------------------- Get environment
   
     my $userenv;      my $userenv;
Line 115  sub success { Line 130  sub success {
     $userenv.="environment.$key=$userenv{$key}\n";      $userenv.="environment.$key=$userenv{$key}\n";
  }   }
     }      }
       if (($userenv{'interface'}) && (!$FORM{'interface'})) {
    $FORM{'interface'}=$userenv{'interface'};
       }
 # --------------------------------------------------------- Write first profile  # --------------------------------------------------------- Write first profile
   
        {      {
     my $idf=Apache::File->new(">$lonids/$cookie.id");   my $idf=Apache::File->new(">$lonids/$cookie.id");
     unless (flock($idf,LOCK_EX)) {   unless (flock($idf,LOCK_EX)) {
       &Apache::lonnet::logthis("<font color=blue>WARNING: ".      &Apache::lonnet::logthis("<font color=blue>WARNING: ".
     'Could not obtain exclusive lock in lonauth: '.$!);     'Could not obtain exclusive lock in lonauth: '.$!);
       $idf->close();  
       return 'error: '.$!;  
     }  
             if ($userenv ne '') { print $idf "$userenv\n"; }  
             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.unicode=$clientunicode\n";  
             print $idf "browser.os=$clientos\n";  
             print $idf "request.course.fn=\n";  
             print $idf "request.course.uri=\n";  
             print $idf "request.course.sec=\n";  
             print $idf "request.role=cm\n";  
             print $idf "request.host=$ENV{'HTTP_HOST'}\n";   
             if ($userroles ne '') { print $idf "$userroles"; }  
     $idf->close();      $idf->close();
         }      return 'error: '.$!;
          $ENV{'request.role'}='cm';   }
          $ENV{'browser.type'}=$clientbrowser;   if ($userenv ne '') { print $idf "$userenv\n"; }
    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.unicode=$clientunicode\n";
    print $idf "browser.os=$clientos\n";
    print $idf "request.course.fn=\n";
    print $idf "request.course.uri=\n";
    print $idf "request.course.sec=\n";
    print $idf "request.role=cm\n";
    print $idf "request.host=$ENV{'REMOTE_ADDR'}\n";
    if ($FORM{'interface'}) {
       $FORM{'interface'}=~s/\W//gs;
       print $idf "browser.interface=$FORM{'interface'}\n";
       $ENV{'browser.interface'}=$FORM{'interface'};
       foreach ('imagesuppress','appletsuppress',
        'embedsuppress','fontenhance','blackwhite') {
    if (($FORM{$_} eq 'true') ||
       ($userenv{$_} eq 'on')) {
       print $idf "browser.$_=on\n";
    }
       }
    }
    if ($userroles ne '') { print $idf "$userroles"; }
    $idf->close();
       }
       $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 166  sub success { Line 196  sub success {
     my $startupremote=&Apache::lonmenu::startupremote($lowerurl);      my $startupremote=&Apache::lonmenu::startupremote($lowerurl);
     my $setflags=&Apache::lonmenu::setflags();      my $setflags=&Apache::lonmenu::setflags();
     my $maincall=&Apache::lonmenu::maincall();      my $maincall=&Apache::lonmenu::maincall();
       my $bodytag=&Apache::loncommon::bodytag('Successful Login');
 # ------------------------------------------------- Output for successful login  # ------------------------------------------------- Output for successful login
   
     $r->send_cgi_header(<<ENDHEADER);      $r->send_cgi_header(<<ENDHEADER);
Line 179  ENDHEADER Line 210  ENDHEADER
 <title>Successful Login to the LearningOnline Network with CAPA</title>  <title>Successful Login to the LearningOnline Network with CAPA</title>
 $startupremote  $startupremote
 </head>  </head>
 <body bgcolor="#FFFFFF">  $bodytag
 $setflags  $setflags
 $windowinfo  $windowinfo
 <h1>Welcome!</h1>  <h1>Welcome!</h1>
Line 197  ENDSUCCESS Line 228  ENDSUCCESS
   
 sub failed {  sub failed {
     my ($r,$message) = @_;      my ($r,$message) = @_;
       my $bodytag=&Apache::loncommon::bodytag('Unsuccessful Login');
     $r->send_cgi_header(<<ENDFHEADER);      $r->send_cgi_header(<<ENDFHEADER);
 Content-type: text/html  Content-type: text/html
   
Line 207  ENDFHEADER Line 239  ENDFHEADER
 <title>Unsuccessful Login to the LearningOnline Network with CAPA</title>  <title>Unsuccessful Login to the LearningOnline Network with CAPA</title>
 </head>  </head>
 <html>  <html>
 <body bgcolor="#FFFFFF">  $bodytag
 <h1>Sorry ...</h1>  <h1>Sorry ...</h1>
 <h2>$message to use the Learning<i>Online</i> Network with CAPA</h2>  <p><b>$message</b></p>
   <p>Please <a href="/adm/login?username=$FORM{'uname'}&domain=$FORM{'udom'}">login</a> again.</p>
   <p>
   <a href="/adm/loginproblems.html">Problems?</a></p>
 </body>  </body>
 </html>  </html>
 ENDFAILED  ENDFAILED
Line 223  sub handler { Line 258  sub handler {
     my $buffer;      my $buffer;
     $r->read($buffer,$r->header_in('Content-length'));      $r->read($buffer,$r->header_in('Content-length'));
     my @pairs=split(/&/,$buffer);      my @pairs=split(/&/,$buffer);
     my $pair; my $name; my $value; my %FORM;      my $pair; my $name; my $value;
       undef %FORM;
       %FORM=();
     foreach $pair (@pairs) {      foreach $pair (@pairs) {
        ($name,$value) = split(/=/,$pair);         ($name,$value) = split(/=/,$pair);
        $value =~ tr/+/ /;         $value =~ tr/+/ /;
Line 232  sub handler { Line 269  sub handler {
     }       } 
   
     if ((!$FORM{'uname'}) || (!$FORM{'upass'}) || (!$FORM{'udom'})) {      if ((!$FORM{'uname'}) || (!$FORM{'upass'}) || (!$FORM{'udom'})) {
  failed($r,'Username, password and domain need to be specified');   failed($r,'Username, password and domain need to be specified.');
         return OK;          return OK;
     }      }
     $FORM{'uname'} =~ s/\W//g;      $FORM{'uname'} =~ s/\W//g;
Line 248  sub handler { Line 285  sub handler {
                                       $FORM{'serverid'});                                        $FORM{'serverid'});
   
     if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {      if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {
  failed($r,'Login token missing, inaccessible or expired');   failed($r,'Information needed to verify your login information is missing, inaccessible or expired.');
         return OK;          return OK;
       } else {
           unless (&Apache::lonnet::reply('tmpdel:'.$FORM{'logtoken'},
                                            $FORM{'serverid'}) eq 'ok') {
               &failed($r,'Session could not be opened.');
    }
     }      }
       
     my ($key,$firsturl)=split(/&/,$tmpinfo);      my ($key,$firsturl)=split(/&/,$tmpinfo);
   
     my $keybin=pack("H16",$key);      my $keybin=pack("H16",$key);
Line 280  sub handler { Line 321  sub handler {
 # --------------------------------------------------------------------- Failed?  # --------------------------------------------------------------------- Failed?
   
     if ($authhost eq 'no_host') {      if ($authhost eq 'no_host') {
  failed($r,'Username and/or password could not be authenticated');   failed($r,'Username and/or password could not be authenticated.');
         return OK;          return OK;
     }      }
   
Removed from v.1.36  
changed lines
  Added in v.1.44

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