--- loncom/auth/loncacc.pm 2002/01/04 15:10:54 1.20 +++ loncom/auth/loncacc.pm 2004/01/27 23:06:22 1.31.2.1 @@ -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.20 2002/01/04 15:10:54 www Exp $ +# $Id: loncacc.pm,v 1.31.2.1 2004/01/27 23:06:22 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,7 +31,6 @@ # 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 -# 12/21 Scott Harrison # YEAR=2002 # 1/4 Gerd Kortemeyer ### @@ -39,36 +38,46 @@ package Apache::loncacc; use strict; -use Apache::Constants qw(:common :http :methods); +use Apache::Constants qw(:common :http :methods REDIRECT); use Apache::File; use CGI::Cookie(); use Fcntl qw(:flock); +use Apache::lonlocal; +use Apache::lonnet(); + sub constructaccess { my ($url,$ownerdomain)=@_; my ($ownername)=($url=~/\/(?:\~|priv\/|home\/)(\w+)/); unless (($ownername) && ($ownerdomain)) { return ''; } - - if (($ownername eq $ENV{'user.name'}) && - ($ownerdomain eq $ENV{'user.domain'})) { - return ($ownername,$ownerdomain); + # 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'}) { + foreach my $domain (@possibledomains) { + if ($domain eq $ENV{'user.domain'}) { + return ($ownername,$domain); + } + } } + - my $capriv='user.priv.ca./'. - $ownerdomain.'/'.$ownername.'./'. - $ownerdomain.'/'.$ownername; - foreach (keys %ENV) { - if ($_ eq $capriv) { - return ($ownername,$ownerdomain); - } + foreach my $domain (@possibledomains) { + my $capriv='user.priv.ca./'.$domain.'/'.$ownername.'./'; + foreach (keys %ENV) { + if ($_ eq $capriv) { + return ($ownername,$domain); + } + } } - return ''; } sub handler { my $r = shift; my $requrl=$r->uri; + $ENV{'request.editurl'}=$requrl; my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); my $lonid=$cookies{'lonID'}; my $cookie; @@ -77,20 +86,17 @@ sub handler { $handle=~s/\W//g; my $lonidsdir=$r->dir_config('lonIDsDir'); if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) { - my @profile; - { - my $idf=Apache::File->new("$lonidsdir/$handle.id"); - flock($idf,LOCK_SH); - @profile=<$idf>; - $idf->close(); - } - my $envi; - for ($envi=0;$envi<=$#profile;$envi++) { - chomp($profile[$envi]); - my ($envname,$envvalue)=split(/=/,$profile[$envi]); - $ENV{$envname} = $envvalue; - } - $ENV{'user.environment'} = "$lonidsdir/$handle.id"; + +# ------------------------------------------------------ Initialize Environment + + &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); + +# --------------------------------------------------------- Initialize Language + + &Apache::lonlocal::get_language_handle($r); + +# -------------------------------------------------------------- Resource State + $ENV{'request.state'} = "construct"; $ENV{'request.filename'} = $r->filename; @@ -98,75 +104,19 @@ sub handler { $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 - - my $buffer; - - $r->read($buffer,$r->header_in('Content-length')); - - unless ($buffer=~/^(\-+\w+)\s+Content\-Disposition\:\s*form\-data/si) { - my @pairs=split(/&/,$buffer); - my $pair; - foreach $pair (@pairs) { - my ($name,$value) = split(/=/,$pair); - $value =~ tr/+/ /; - $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - $name =~ tr/+/ /; - $name =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - $ENV{"form.$name"}=$value; - } - } else { - my $contentsep=$1; - my @lines = split (/\n/,$buffer); - my $name=''; - my $value=''; - my $fname=''; - my $fmime=''; - my $i; - for ($i=0;$i<=$#lines;$i++) { - if ($lines[$i]=~/^$contentsep/) { - if ($name) { - chomp($value); - if ($fname) { - $ENV{"form.$name.filename"}=$fname; - $ENV{"form.$name.mimetype"}=$fmime; - } else { - $value=~s/\s+$//s; - } - $ENV{"form.$name"}=$value; - } - if ($i<$#lines) { - $i++; - $lines[$i]=~ - /Content\-Disposition\:\s*form\-data\;\s*name\=\"([^\"]+)\"/i; - $name=$1; - $value=''; - if ($lines[$i]=~/filename\=\"([^\"]+)\"/i) { - $fname=$1; - if - ($lines[$i+1]=~/Content\-Type\:\s*([\w\-\/]+)/i) { - $fmime=$1; - $i++; - } else { - $fmime=''; - } - } else { - $fname=''; - $fmime=''; - } - $i++; - } - } else { - $value.=$lines[$i]."\n"; - } - } - } - $ENV{'request.method'}=$ENV{'REQUEST_METHOD'}; - $r->method_number(M_GET); - $r->method('GET'); - $r->headers_in->unset('Content-length'); + &Apache::loncommon::get_posted_cgi($r); return OK; } else { @@ -189,7 +139,7 @@ Apache::lonacc - Cookie Based Access Han =head1 SYNOPSIS -Invoked (for various locations) by /etc/httpd/conf/srm.conf: +Invoked (for various locations) by /etc/httpd/conf/loncapa_apache.conf: PerlAccessHandler Apache::loncacc