--- loncom/auth/lonacc.pm	2002/10/25 13:59:40	1.36
+++ loncom/auth/lonacc.pm	2005/07/05 21:30:14	1.66
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.36 2002/10/25 13:59:40 www Exp $
+# $Id: lonacc.pm,v 1.66 2005/07/05 21:30:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,17 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# YEAR=1999
-# 5/21/99,5/22,5/29,5/31,6/15,16/11,22/11,
-# YEAR=2000
-# 01/06,01/13,05/31,06/01,09/06,09/25,09/28,10/30,11/6,
-# 12/25,12/26,
-# YEAR=2001
-# 01/06/01,05/28,8/11,9/26,11/29 Gerd Kortemeyer
-# 12/15 Scott Harrison
-# YEAR=2002
-# 1/4,2/25 Gerd Kortemeyer
-#
 ###
 
 package Apache::lonacc;
@@ -45,6 +34,7 @@ use Apache::Constants qw(:common :http :
 use Apache::File;
 use Apache::lonnet;
 use Apache::loncommon();
+use Apache::lonlocal;
 use CGI::Cookie();
 use Fcntl qw(:flock);
 
@@ -60,140 +50,99 @@ sub handler {
         my $lonidsdir=$r->dir_config('lonIDsDir');
         if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
 
-# ------------------------------------------- Transfer profile into environment
-
-            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";
-            if ($requrl=~/^\/res\//) {
-               $ENV{'request.state'} = "published";
-	    } else {
-	       $ENV{'request.state'} = 'unknown';
-            }
-            $ENV{'request.filename'} = $r->filename;
+# ------------------------------------------------------ Initialize Environment
 
-# -------------------------------------------------------- Load POST parameters
+            &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
 
+# --------------------------------------------------------- Initialize Language
 
-           
-        my $buffer;
+	    &Apache::lonlocal::get_language_handle($r);
 
-        $r->read($buffer,$r->header_in('Content-length'));
+# -------------------------------------------------------------- Resource State
 
-	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;
-	       &Apache::loncommon::add_to_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;
-                        }
-			&Apache::loncommon::add_to_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";
-                }
+            if ($requrl=~/^\/+(res|uploaded)\//) {
+               $env{'request.state'} = "published";
+	    } else {
+	       $env{'request.state'} = 'unknown';
             }
-	}
-	    $ENV{'request.method'}=$ENV{'REQUEST_METHOD'};
-            $r->method_number(M_GET);
-	    $r->method('GET');
-            $r->headers_in->unset('Content-length');
+            $env{'request.filename'} = $r->filename;
+            $env{'request.noversionuri'} = &Apache::lonnet::deversion($requrl);
+# -------------------------------------------------------- Load POST parameters
+
+	    &Apache::loncommon::get_posted_cgi($r);
 
 # ---------------------------------------------------------------- Check access
 
-            if ($requrl!~/^\/adm|public\//) {
+            if ($requrl!~/^\/adm|public|prtspool\//) {
 		my $access=&Apache::lonnet::allowed('bre',$requrl);
                 if ($access eq '1') {
-		   $ENV{'user.error.msg'}="$requrl:bre:0:0:Choose Course";
+		   $env{'user.error.msg'}="$requrl:bre:0:0:Choose Course";
 	           return HTTP_NOT_ACCEPTABLE; 
                 }
                 if (($access ne '2') && ($access ne 'F')) {
-		   $ENV{'user.error.msg'}="$requrl:bre:1:1:Access Denied";
+		   $env{'user.error.msg'}="$requrl:bre:1:1:Access Denied";
 	           return HTTP_NOT_ACCEPTABLE; 
                 }
             }
+	    if ($requrl =~ m|^/prtspool/|) {
+		my $start='/prtspool/'.$env{'user.name'}.'_'.
+		    $env{'user.domain'};
+		if ($requrl !~ /^\Q$start\E/) {
+		    $env{'user.error.msg'}="$requrl:bre:1:1:Access Denied";
+		    return HTTP_NOT_ACCEPTABLE;
+		}
+	    }
 # ------------------------------------------------------------- This is allowed
-          if ($ENV{'request.course.id'}) {
+          if ($env{'request.course.id'}) {
 	    &Apache::lonnet::countacc($requrl);
             $requrl=~/\.(\w+)$/;
-            if (&Apache::loncommon::fileembstyle($1) eq 'ssi') {
+            if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
+ ($requrl=~/^\/adm\/.*\/(aboutme|navmaps|smppg|bulletinboard)(\?|$)/) ||
+ ($requrl=~/^\/adm\/wrapper\//) ||
+ ($requrl=~m|\.problem/smpedit$|) ||
+ ($requrl=~/^\/public\/.*\/syllabus$/)) {
 # ------------------------------------- This is serious stuff, get symb and log
 		my $query=$r->args;
                 my $symb;
                 if ($query) {
 		    &Apache::loncommon::get_unprocessed_cgi($query,['symb']);
                 }
-                if ($ENV{'form.symb'}) {
-		    $symb=&Apache::lonnet::symbclean($ENV{'form.symb'});
-                    if (&Apache::lonnet::symbverify($symb,$requrl)) {
-                      my ($map,$mid,$murl)=split(/\_\_\_/,$symb);
-                      &Apache::lonnet::symblist($map,$murl => $mid,
-                                               'last_known' => $murl);
+                if ($env{'form.symb'}) {
+		    $symb=&Apache::lonnet::symbclean($env{'form.symb'});
+                    if ($requrl =~ m|^/adm/wrapper/|) {
+                        my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);
+                        &Apache::lonnet::symblist($map,$murl => [$murl,$mid],
+						  'last_known' =>[$murl,$mid]);
+                    } elsif ((&Apache::lonnet::symbverify($symb,$requrl)) ||
+			     (($requrl=~m|(.*)/smpedit$|) &&
+			      &Apache::lonnet::symbverify($symb,$1))) {
+                      my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);
+                      &Apache::lonnet::symblist($map,$murl => [$murl,$mid],
+						'last_known' =>[$murl,$mid]);
 		    } else {
 			$r->log_reason('Invalid symb for '.$requrl.': '.
                                        $symb);
-		        $ENV{'user.error.msg'}=
+		        $env{'user.error.msg'}=
                                 "$requrl:bre:1:1:Invalid Access";
   	                return HTTP_NOT_ACCEPTABLE; 
                     }
                 } else {
-	            $symb=&Apache::lonnet::symbread;
+	            $symb=&Apache::lonnet::symbread($requrl);
+		    if (&Apache::lonnet::is_on_map($requrl) && $symb &&
+			!&Apache::lonnet::symbverify($symb,$requrl)) {
+			$r->log_reason('Invalid symb for '.$requrl.': '.$symb);
+		        $env{'user.error.msg'}=
+                                "$requrl:bre:1:1:Invalid Access";
+  	                return HTTP_NOT_ACCEPTABLE; 
+		    }
+		    if ($symb) {
+			my ($map,$mid,$murl)=
+			    &Apache::lonnet::decode_symb($symb);
+			&Apache::lonnet::symblist($map,$murl =>[$murl,$mid],
+						'last_known' =>[$murl,$mid]);
+		    }
                 }
-                $ENV{'request.symb'}=$symb;
+                $env{'request.symb'}=$symb;
                 &Apache::lonnet::courseacclog($symb);
             } else {
 # ------------------------------------------------------- This is other content
@@ -207,27 +156,34 @@ sub handler {
     }
 
 # -------------------------------------------- See if this is a public resource
-    if (($requrl=~/^\/public\//) || 
-        (&Apache::lonnet::metadata($requrl,'copyright') eq 'public')) {
+    if ($requrl=~m|^/public/|
+	|| (&Apache::lonnet::metadata($requrl,'copyright') eq 'public')) {
         &Apache::lonnet::logthis('Granting public access: '.$requrl);
-	$ENV{'user.name'}='public';
-        $ENV{'user.domain'}='public';
-        $ENV{'request.state'} = "published";
-        $ENV{'request.publicaccess'} = 1;
-        $ENV{'request.filename'} = $r->filename;
+	my $cookie=
+	    &Apache::lonauth::success($r,'public','public','public');
+        my $lonidsdir=$r->dir_config('lonIDsDir');
+	&Apache::lonnet::transfer_profile_to_env($lonidsdir,$cookie);
+	&Apache::loncommon::get_posted_cgi($r);
+        $env{'request.state'} = "published";
+        $env{'request.publicaccess'} = 1;
+        $env{'request.filename'} = $r->filename;
+
+	$r->header_out('Set-cookie',"lonID=$cookie; path=/");
         return OK;
     }
 # -------------------------------------------------------------- Not authorized
     $requrl=~/\.(\w+)$/;
-    if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
-        ($requrl=~/^\/adm\/(roles|logout)/)) {
+#    if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
+#        ($requrl=~/^\/adm\/(roles|logout|email|menu|remote)/) ||
+#        ($requrl=~m|^/prtspool/|)) {
 # -------------------------- Store where they wanted to go and get login screen
-       $ENV{'request.firsturl'}=$requrl;
+	$env{'request.querystring'}=$r->args;
+	$env{'request.firsturl'}=$requrl;
        return FORBIDDEN;
-   } else {
+#   } else {
 # --------------------------------------------------------------------- Goodbye
-       return HTTP_BAD_REQUEST;
-   }
+#       return HTTP_BAD_REQUEST;
+#   }
 }
 
 1;