--- loncom/auth/loncacc.pm	2001/01/06 16:12:24	1.14
+++ loncom/auth/loncacc.pm	2003/02/03 18:03:52	1.25
@@ -1,8 +1,39 @@
 # 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.25 2003/02/03 18:03:52 harris41 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/
+#
+# YEAR=2000
 # 6/15,16/11,22/11,
-# 01/06,01/11,6/1,9/25,9/28,11/22,12/25,12/26,06/01 Gerd Kortemeyer
+# 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;
 
@@ -12,9 +43,33 @@ 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 ''; }
+    # We do not allow editing of previous versions of files.
+    if ($url=~/\.(\d+)\.(\w+)$/) { return ''; }
+    if (($ownername eq $ENV{'user.name'}) &&
+        ($ownerdomain eq $ENV{'user.domain'})) {
+	return ($ownername,$ownerdomain);
+    }
+
+    my $capriv='user.priv.ca./'.
+               $ownerdomain.'/'.$ownername.'./'.
+	       $ownerdomain.'/'.$ownername;
+    foreach (keys %ENV) {
+        if ($_ eq $capriv) {
+           return ($ownername,$ownerdomain);
+        }
+    }
+
+    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;
@@ -23,17 +78,6 @@ sub handler {
         $handle=~s/\W//g;
         my $lonidsdir=$r->dir_config('lonIDsDir');
         if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
-            my $ownername=$requrl;
-            $ownername=~s/\/(?:\~|priv\/)(\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");
@@ -51,6 +95,11 @@ 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
 
 
@@ -67,7 +116,7 @@ sub handler {
                $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;
+	       &Apache::loncommon::add_to_env("form.$name",$value);
             } 
         } else {
 	    my $contentsep=$1;
@@ -87,7 +136,7 @@ sub handler {
                         } else {
                             $value=~s/\s+$//s;
                         }
-                        $ENV{"form.$name"}=$value;
+			&Apache::loncommon::add_to_env("form.$name",$value);
                     }
                     if ($i<$#lines) {
 			$i++;
@@ -115,6 +164,7 @@ sub handler {
                 }
             }
 	}
+            $ENV{'request.method'}=$ENV{'REQUEST_METHOD'};
             $r->method_number(M_GET);
 	    $r->method('GET');
             $r->headers_in->unset('Content-length');
@@ -134,6 +184,61 @@ sub handler {
 1;
 __END__
 
+=head1 NAME
+
+Apache::lonacc - Cookie Based Access Handler for Construction Area
+
+=head1 SYNOPSIS
+
+Invoked (for various locations) by /etc/httpd/conf/loncapa_apache.conf:
+
+ PerlAccessHandler       Apache::loncacc
+
+=head1 INTRODUCTION
+
+This module enables cookie based authentication for construction area
+and is used to control access for three (essentially equivalent) URIs.
+
+ <LocationMatch "^/priv.*">
+ <LocationMatch "^/\~.*">
+ <LocationMatch "^/\~.*/$">
+
+Whenever the client sends the cookie back to the server, 
+if the cookie is missing or invalid, the user is re-challenged
+for login information.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 HANDLER SUBROUTINE
+
+This routine is called by Apache and mod_perl.
+
+=over 4
+
+=item *
+
+load POST parameters
+
+=item *
+
+store where they wanted to go (first url entered)
+
+=back
+
+=head1 OTHERSUBROUTINES
+
+=over 4
+
+=item *
+
+constructaccess($url,$ownerdomain) : See if the owner domain and name
+in the URL match those in the expected environment.  If so, return 
+two element list ($ownername,$ownerdomain).  Else, return null string.
+
+=back
+
+=cut