--- loncom/auth/loncacc.pm	2000/09/25 20:34:28	1.9
+++ loncom/auth/loncacc.pm	2001/11/29 19:12:44	1.17
@@ -1,8 +1,34 @@
 # The LearningOnline Network
 # Cookie Based Access Handler for Construction Area
 # (lonacc: 5/21/99,5/22,5/29,5/31 Gerd Kortemeyer)
+#
+# $Id: loncacc.pm,v 1.17 2001/11/29 19:12:44 www Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 6/15,16/11,22/11,
-# 01/06,01/11,6/1,9/25 Gerd Kortemeyer
+# 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
 
 package Apache::loncacc;
 
@@ -10,6 +36,29 @@ use strict;
 use Apache::Constants qw(:common :http :methods);
 use Apache::File;
 use CGI::Cookie();
+use Fcntl qw(:flock);
+
+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);
+    }
+
+    my $capriv='user.priv.ca./'.
+               $ownerdomain.'/'.$ownername.'./'.
+	       $ownerdomain.'/'.$ownername;
+    map {
+        if ($_ eq $capriv) {
+           return ($ownername,$ownerdomain);
+        }
+    } keys %ENV;
+
+    return '';
+}
 
 sub handler {
     my $r = shift;
@@ -22,21 +71,12 @@ sub handler {
         $handle=~s/\W//g;
         my $lonidsdir=$r->dir_config('lonIDsDir');
         if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
-            my $ownername=$requrl;
-            $ownername=~s/\/\~(\w+).*/\1/;
-            my $ownerdomain=$r->dir_config('lonDefDomain');
-            my @handleparts=split(/\_/,$handle);
-            my $username=$handleparts[0];
-            my $domain=$handleparts[2];
-            if (($username ne $ownername) || ($domain ne $ownerdomain)) {
-                $r->log_reason
-                   ("$username at $domain not authorized", $r->filename); 
-	        return HTTP_NOT_ACCEPTABLE;
-            }
             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++) {
@@ -48,21 +88,75 @@ sub handler {
             $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;
+            }
+
 # -------------------------------------------------------- Load POST parameters
 
 
-            my $buffer;
+        my $buffer;
+
+        $r->read($buffer,$r->header_in('Content-length'));
 
-            $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";
+                }
+            }
+	}
             $r->method_number(M_GET);
 	    $r->method('GET');
             $r->headers_in->unset('Content-length');