--- loncom/auth/loncacc.pm 2004/01/27 23:06:22 1.31.2.1 +++ loncom/auth/loncacc.pm 2006/04/13 19:07:33 1.41 @@ -2,7 +2,7 @@ # Cookie Based Access Handler for Construction Area # (lonacc: 5/21/99,5/22,5/29,5/31 Gerd Kortemeyer) # -# $Id: loncacc.pm,v 1.31.2.1 2004/01/27 23:06:22 albertel Exp $ +# $Id: loncacc.pm,v 1.41 2006/04/13 19:07:33 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,49 +26,36 @@ # # 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; use strict; use Apache::Constants qw(:common :http :methods REDIRECT); -use Apache::File; use CGI::Cookie(); use Fcntl qw(:flock); use Apache::lonlocal; -use Apache::lonnet(); - +use Apache::lonnet; +use Apache::lonacc; sub constructaccess { my ($url,$ownerdomain)=@_; - my ($ownername)=($url=~/\/(?:\~|priv\/|home\/)(\w+)/); + my ($ownername)=($url=~/\/(?:\~|priv\/|home\/)(\w+)\//); unless (($ownername) && ($ownerdomain)) { return ''; } # We do not allow editing of previous versions of files. if ($url=~/\.(\d+)\.(\w+)$/) { return ''; } my @possibledomains = &Apache::lonnet::current_machine_domains(); - &Apache::lonnet::logthis("got domains of ".join(':',@possibledomains)); - if ($ownername eq $ENV{'user.name'}) { + if ($ownername eq $env{'user.name'}) { foreach my $domain (@possibledomains) { - if ($domain eq $ENV{'user.domain'}) { + if ($domain eq $env{'user.domain'}) { return ($ownername,$domain); } } } - foreach my $domain (@possibledomains) { - my $capriv='user.priv.ca./'.$domain.'/'.$ownername.'./'; - foreach (keys %ENV) { - if ($_ eq $capriv) { - return ($ownername,$domain); - } + if (exists($env{'user.priv.ca./'.$domain.'/'.$ownername.'./'}) || + exists($env{'user.priv.aa./'.$domain.'/'.$ownername.'./'}) ) { + return ($ownername,$domain); } } return ''; @@ -77,7 +64,7 @@ sub constructaccess { sub handler { my $r = shift; my $requrl=$r->uri; - $ENV{'request.editurl'}=$requrl; + $env{'request.editurl'}=$requrl; my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); my $lonid=$cookies{'lonID'}; my $cookie; @@ -97,26 +84,17 @@ sub handler { # -------------------------------------------------------------- Resource State - $ENV{'request.state'} = "construct"; - $ENV{'request.filename'} = $r->filename; + $env{'request.state'} = "construct"; + $env{'request.filename'} = $r->filename; unless (&constructaccess($requrl,$r->dir_config('lonDefDomain'))) { $r->log_reason("Unauthorized $requrl", $r->filename); return HTTP_NOT_ACCEPTABLE; } -# Construction space needs Remote to work - if ($ENV{'environment.remote'} eq 'off') { - $r->content_type('text/html'); - $r->header_out(Location => - 'http://'.$r->server->server_hostname. - '/adm/remote?action=launch&url='. - &Apache::lonnet::escape($requrl)); - return REDIRECT; - } # -------------------------------------------------------- Load POST parameters - &Apache::loncommon::get_posted_cgi($r); + &Apache::lonacc::get_posted_cgi($r); return OK; } else { @@ -126,7 +104,7 @@ sub handler { # ----------------------------------------------- Store where they wanted to go - $ENV{'request.firsturl'}=$requrl; + $env{'request.firsturl'}=$requrl; return FORBIDDEN; }