--- loncom/auth/lonacc.pm	2002/01/04 14:57:14	1.26
+++ loncom/auth/lonacc.pm	2003/04/16 15:59:15	1.44
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.26 2002/01/04 14:57:14 www Exp $
+# $Id: lonacc.pm,v 1.44 2003/04/16 15:59:15 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,9 +32,8 @@
 # 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 Gerd Kortemeyer
+# 1/4,2/25 Gerd Kortemeyer
 #
 ###
 
@@ -90,7 +89,6 @@ sub handler {
         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;
@@ -100,7 +98,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;
@@ -120,7 +118,7 @@ sub handler {
                         } else {
                             $value=~s/\s+$//s;
                         }
-                        $ENV{"form.$name"}=$value;
+			&Apache::loncommon::add_to_env("form.$name",$value);
                     }
                     if ($i<$#lines) {
 			$i++;
@@ -155,7 +153,7 @@ sub handler {
 
 # ---------------------------------------------------------------- Check access
 
-            if ($requrl!~/^\/adm\//) {
+            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";
@@ -166,13 +164,47 @@ sub handler {
 	           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'}) {
 	    &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=~/^\/public\/.*\/syllabus$/)) {
 # ------------------------------------- This is serious stuff, get symb and log
-		my $symb=&Apache::lonnet::symbread;
+		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);
+		    } else {
+			$r->log_reason('Invalid symb for '.$requrl.': '.
+                                       $symb);
+		        $ENV{'user.error.msg'}=
+                                "$requrl:bre:1:1:Invalid Access";
+  	                return HTTP_NOT_ACCEPTABLE; 
+                    }
+                } else {
+	            $symb=&Apache::lonnet::symbread($requrl);
+                    my ($map,$mid,$murl)=split(/\_\_\_/,$symb);
+		    &Apache::lonnet::symblist($map,$murl => $mid,
+                                              'last_known' => $murl);
+                }
                 $ENV{'request.symb'}=$symb;
                 &Apache::lonnet::courseacclog($symb);
             } else {
@@ -187,8 +219,12 @@ sub handler {
     }
 
 # -------------------------------------------- See if this is a public resource
-    if (&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);
+	my $buffer;
+	$r->read($buffer,$r->header_in('Content-length'));
+	&Apache::loncommon::get_unprocessed_cgi($buffer);
 	$ENV{'user.name'}='public';
         $ENV{'user.domain'}='public';
         $ENV{'request.state'} = "published";
@@ -196,10 +232,19 @@ sub handler {
         $ENV{'request.filename'} = $r->filename;
         return OK;
     }
-# ----------------------------------------------- Store where they wanted to go
-    
-    $ENV{'request.firsturl'}=$requrl;
-    return FORBIDDEN;
+# -------------------------------------------------------------- Not authorized
+    $requrl=~/\.(\w+)$/;
+    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.querystring'}=$r->args;
+	$ENV{'request.firsturl'}=$requrl;
+       return FORBIDDEN;
+   } else {
+# --------------------------------------------------------------------- Goodbye
+       return HTTP_BAD_REQUEST;
+   }
 }
 
 1;