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

Diff for /loncom/auth/lonacc.pm between versions 1.110.2.1 and 1.111

version 1.110.2.1, 2007/11/06 18:07:35 version 1.111, 2007/10/02 01:09:59
Line 37  use Apache::loncommon(); Line 37  use Apache::loncommon();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::restrictedaccess();  use Apache::restrictedaccess();
 use Apache::blockedaccess();   use Apache::blockedaccess(); 
 use CGI::Cookie();  
 use Fcntl qw(:flock);  use Fcntl qw(:flock);
 use LONCAPA;  use LONCAPA;
   
Line 64  sub get_posted_cgi { Line 63  sub get_posted_cgi {
     if ($r->header_in('Content-length')) {      if ($r->header_in('Content-length')) {
  $r->read($buffer,$r->header_in('Content-length'),0);   $r->read($buffer,$r->header_in('Content-length'),0);
     }      }
     my $content_type = $r->header_in('Content-type');      unless ($buffer=~/^(\-+\w+)\s+Content\-Disposition\:\s*form\-data/si) {
     if ($content_type !~ m{^multipart/form-data}) {  
  my @pairs=split(/&/,$buffer);   my @pairs=split(/&/,$buffer);
  my $pair;   my $pair;
  foreach $pair (@pairs) {   foreach $pair (@pairs) {
Line 77  sub get_posted_cgi { Line 75  sub get_posted_cgi {
     &Apache::loncommon::add_to_env("form.$name",$value);      &Apache::loncommon::add_to_env("form.$name",$value);
  }   }
     } else {      } else {
  my ($contentsep) = ($content_type =~ /boundary=\"?([^\";,]+)\"?/);   my $contentsep=$1;
  my @lines = split (/\n/,$buffer);   my @lines = split (/\n/,$buffer);
  my $name='';   my $name='';
  my $value='';   my $value='';
Line 85  sub get_posted_cgi { Line 83  sub get_posted_cgi {
  my $fmime='';   my $fmime='';
  my $i;   my $i;
  for ($i=0;$i<=$#lines;$i++) {   for ($i=0;$i<=$#lines;$i++) {
     if ($lines[$i]=~/^--\Q$contentsep\E/) {      if ($lines[$i]=~/^$contentsep/) {
  if ($name) {   if ($name) {
     chomp($value);      chomp($value);
     if ($fname) {      if ($fname) {
Line 146  sub get_posted_cgi { Line 144  sub get_posted_cgi {
 # returns OK if it was a SSO and user was handled  # returns OK if it was a SSO and user was handled
 #         undef if not SSO or no means to hanle the user  #         undef if not SSO or no means to hanle the user
 sub sso_login {  sub sso_login {
     my ($r,$lonid,$handle) = @_;      my ($r,$handle) = @_;
   
     my $lonidsdir=$r->dir_config('lonIDsDir');      my $lonidsdir=$r->dir_config('lonIDsDir');
     if (!($r->user       if (!($r->user 
   && (!defined($env{'user.name'}) && !defined($env{'user.domain'}))    && (!defined($env{'user.name'}) && !defined($env{'user.domain'}))
   && (!$lonid || !-e "$lonidsdir/$handle.id" || $handle eq ''))) {    && ($handle eq ''))) {
  # not an SSO case or already logged in   # not an SSO case or already logged in
  return undef;   return undef;
     }      }
Line 211  sub handler { Line 209  sub handler {
     if (&Apache::lonnet::is_domainimage($requrl)) {      if (&Apache::lonnet::is_domainimage($requrl)) {
         return OK;          return OK;
     }      }
     my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));  
     my $lonid=$cookies{'lonID'};  
     my $cookie;  
     my $lonidsdir=$r->dir_config('lonIDsDir');  
   
     my $handle;      
     if ($lonid) {      my $handle = &Apache::lonnet::check_for_valid_session($r);
  $handle=&LONCAPA::clean_handle($lonid->value);  
     }  
   
     my $result = &sso_login($r,$lonid,$handle);      my $result = &sso_login($r,$handle);
     if (defined($result)) {      if (defined($result)) {
  return $result   return $result
     }      }
Line 234  sub handler { Line 226  sub handler {
           
     if ($handle eq '') {      if ($handle eq '') {
  $r->log_reason("Cookie $handle not valid", $r->filename);    $r->log_reason("Cookie $handle not valid", $r->filename); 
     } elsif ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {      } elsif ($handle ne '') {
   
 # ------------------------------------------------------ Initialize Environment  # ------------------------------------------------------ Initialize Environment
    my $lonidsdir=$r->dir_config('lonIDsDir');
  &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);   &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
   
 # --------------------------------------------------------- Initialize Language  # --------------------------------------------------------- Initialize Language
Removed from v.1.110.2.1  
changed lines
  Added in v.1.111

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