--- loncom/auth/lonacc.pm	2001/12/15 20:40:23	1.25
+++ loncom/auth/lonacc.pm	2002/08/27 14:23:18	1.35
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.25 2001/12/15 20:40:23 harris41 Exp $
+# $Id: lonacc.pm,v 1.35 2002/08/27 14:23:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,8 @@
 # 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
 #
 ###
 
@@ -98,7 +100,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;
@@ -118,7 +120,7 @@ sub handler {
                         } else {
                             $value=~s/\s+$//s;
                         }
-                        $ENV{"form.$name"}=$value;
+			&Apache::loncommon::add_to_env("form.$name",$value);
                     }
                     if ($i<$#lines) {
 			$i++;
@@ -146,6 +148,7 @@ sub handler {
                 }
             }
 	}
+	    $ENV{'request.method'}=$ENV{'REQUEST_METHOD'};
             $r->method_number(M_GET);
 	    $r->method('GET');
             $r->headers_in->unset('Content-length');
@@ -169,7 +172,27 @@ sub handler {
             $requrl=~/\.(\w+)$/;
             if (&Apache::loncommon::fileembstyle($1) eq 'ssi') {
 # ------------------------------------- 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;
+                }
                 $ENV{'request.symb'}=$symb;
                 &Apache::lonnet::courseacclog($symb);
             } else {
@@ -184,7 +207,8 @@ sub handler {
     }
 
 # -------------------------------------------- See if this is a public resource
-    if (&Apache::lonnet::metadata($requrl,'copyright') eq 'public') {
+    if (($requrl=~/^\/public\//) || 
+        (&Apache::lonnet::metadata($requrl,'copyright') eq 'public')) {
         &Apache::lonnet::logthis('Granting public access: '.$requrl);
 	$ENV{'user.name'}='public';
         $ENV{'user.domain'}='public';
@@ -193,10 +217,17 @@ 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)/)) {
+# -------------------------- Store where they wanted to go and get login screen
+       $ENV{'request.firsturl'}=$requrl;
+       return FORBIDDEN;
+   } else {
+# --------------------------------------------------------------------- Goodbye
+       return HTTP_BAD_REQUEST;
+   }
 }
 
 1;