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

Diff for /loncom/auth/loncacc.pm between versions 1.37 and 1.38

version 1.37, 2004/10/29 20:44:30 version 1.38, 2005/04/07 06:56:21
Line 26 Line 26
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # YEAR=2000  
 # 6/15,16/11,22/11,  
 # YEAR=2001  
 # 01/06,01/11,6/1,9/25,9/28,11/22,12/25,12/26,  
 # 01/06/01,05/04,05/05,05/09 Gerd Kortemeyer  
 # YEAR=2002  
 # 1/4 Gerd Kortemeyer  
 ###  
   
 package Apache::loncacc;  package Apache::loncacc;
   
Line 43  use Apache::File; Line 35  use Apache::File;
 use CGI::Cookie();  use CGI::Cookie();
 use Fcntl qw(:flock);  use Fcntl qw(:flock);
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet();  use Apache::lonnet;
   
   
 sub constructaccess {  sub constructaccess {
Line 53  sub constructaccess { Line 45  sub constructaccess {
     # We do not allow editing of previous versions of files.      # We do not allow editing of previous versions of files.
     if ($url=~/\.(\d+)\.(\w+)$/) { return ''; }      if ($url=~/\.(\d+)\.(\w+)$/) { return ''; }
     my @possibledomains = &Apache::lonnet::current_machine_domains();      my @possibledomains = &Apache::lonnet::current_machine_domains();
     if ($ownername eq $ENV{'user.name'}) {      if ($ownername eq $env{'user.name'}) {
  foreach my $domain (@possibledomains) {   foreach my $domain (@possibledomains) {
     if ($domain eq $ENV{'user.domain'}) {      if ($domain eq $env{'user.domain'}) {
  return ($ownername,$domain);   return ($ownername,$domain);
     }      }
  }   }
Line 63  sub constructaccess { Line 55  sub constructaccess {
           
     foreach my $domain (@possibledomains) {      foreach my $domain (@possibledomains) {
  my $capriv='user.priv.ca./'.$domain.'/'.$ownername.'./';   my $capriv='user.priv.ca./'.$domain.'/'.$ownername.'./';
  foreach (keys %ENV) {   foreach (keys %env) {
     if ($_ eq $capriv) {      if ($_ eq $capriv) {
  return ($ownername,$domain);   return ($ownername,$domain);
     }      }
Line 75  sub constructaccess { Line 67  sub constructaccess {
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
     my $requrl=$r->uri;      my $requrl=$r->uri;
     $ENV{'request.editurl'}=$requrl;      $env{'request.editurl'}=$requrl;
     my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));      my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
     my $lonid=$cookies{'lonID'};      my $lonid=$cookies{'lonID'};
     my $cookie;      my $cookie;
Line 95  sub handler { Line 87  sub handler {
   
 # -------------------------------------------------------------- Resource State  # -------------------------------------------------------------- Resource State
   
             $ENV{'request.state'}    = "construct";              $env{'request.state'}    = "construct";
             $ENV{'request.filename'} = $r->filename;              $env{'request.filename'} = $r->filename;
   
             unless (&constructaccess($requrl,$r->dir_config('lonDefDomain'))) {              unless (&constructaccess($requrl,$r->dir_config('lonDefDomain'))) {
                 $r->log_reason("Unauthorized $requrl", $r->filename);                   $r->log_reason("Unauthorized $requrl", $r->filename); 
Line 115  sub handler { Line 107  sub handler {
   
 # ----------------------------------------------- Store where they wanted to go  # ----------------------------------------------- Store where they wanted to go
   
     $ENV{'request.firsturl'}=$requrl;      $env{'request.firsturl'}=$requrl;
     return FORBIDDEN;      return FORBIDDEN;
 }  }
   
Removed from v.1.37  
changed lines
  Added in v.1.38

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