--- loncom/auth/lonacc.pm	2004/12/14 20:32:15	1.53
+++ loncom/auth/lonacc.pm	2005/02/08 01:20:11	1.62
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.53 2004/12/14 20:32:15 albertel Exp $
+# $Id: lonacc.pm,v 1.62 2005/02/08 01:20:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -117,7 +117,6 @@ sub handler {
                 if ($query) {
 		    &Apache::loncommon::get_unprocessed_cgi($query,['symb']);
                 }
-		&Apache::lonnet::logthis("form.symb is ".$ENV{'form.symb'});
                 if ($ENV{'form.symb'}) {
 		    $symb=&Apache::lonnet::symbclean($ENV{'form.symb'});
                     if ($requrl =~ m|^/adm/wrapper/|) {
@@ -139,9 +138,18 @@ sub handler {
                     }
                 } else {
 	            $symb=&Apache::lonnet::symbread($requrl);
-                    my ($map,$mid,$murl)=split(/\_\_\_/,$symb);
-		    &Apache::lonnet::symblist($map,$murl => $mid,
-                                              'last_known' => $murl);
+		    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)=split(/\_\_\_/,$symb);
+			&Apache::lonnet::symblist($map,$murl => $mid,
+						  'last_known' => $murl);
+		    }
                 }
                 $ENV{'request.symb'}=$symb;
                 &Apache::lonnet::courseacclog($symb);
@@ -160,29 +168,36 @@ sub handler {
     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'),0);
-	&Apache::loncommon::get_unprocessed_cgi($buffer);
+	&Apache::loncommon::get_posted_cgi($r);
 	$ENV{'user.name'}='public';
         $ENV{'user.domain'}='public';
         $ENV{'request.state'} = "published";
         $ENV{'request.publicaccess'} = 1;
         $ENV{'request.filename'} = $r->filename;
+	my ($httpbrowser,  $clientbrowser, $clientversion,
+	    $clientmathml, $clientunicode, $clientos) =
+		&Apache::loncommon::decode_user_agent($r);
+	$ENV{'browser.type'}=$clientbrowser;
+        $ENV{'browser.version'}=$clientversion;
+        $ENV{'browser.mathml'}=$clientmathml;
+        $ENV{'browser.unicode'}=$clientunicode;
+        $ENV{'browser.os'}=$clientos;
+
         return OK;
     }
 # -------------------------------------------------------------- Not authorized
     $requrl=~/\.(\w+)$/;
-    if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
-        ($requrl=~/^\/adm\/(roles|logout|email|menu|remote)/) ||
-        ($requrl=~m|^/prtspool/|)) {
+#    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 {
+#   } else {
 # --------------------------------------------------------------------- Goodbye
-       return HTTP_BAD_REQUEST;
-   }
+#       return HTTP_BAD_REQUEST;
+#   }
 }
 
 1;