--- loncom/auth/lonacc.pm	2004/12/17 19:43:19	1.54
+++ loncom/auth/lonacc.pm	2005/04/07 06:56:20	1.64
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.54 2004/12/17 19:43:19 albertel Exp $
+# $Id: lonacc.pm,v 1.64 2005/04/07 06:56:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,12 +71,12 @@ sub handler {
 # -------------------------------------------------------------- Resource State
 
             if ($requrl=~/^\/+(res|uploaded)\//) {
-               $ENV{'request.state'} = "published";
+               $env{'request.state'} = "published";
 	    } else {
-	       $ENV{'request.state'} = 'unknown';
+	       $env{'request.state'} = 'unknown';
             }
-            $ENV{'request.filename'} = $r->filename;
-            $ENV{'request.noversionuri'} = &Apache::lonnet::deversion($requrl);
+            $env{'request.filename'} = $r->filename;
+            $env{'request.noversionuri'} = &Apache::lonnet::deversion($requrl);
 # -------------------------------------------------------- Load POST parameters
 
 	    &Apache::loncommon::get_posted_cgi($r);
@@ -86,24 +86,24 @@ sub handler {
             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'};
+		my $start='/prtspool/'.$env{'user.name'}.'_'.
+		    $env{'user.domain'};
 		if ($requrl !~ /^\Q$start\E/) {
-		    $ENV{'user.error.msg'}="$requrl:bre:1:1:Access Denied";
+		    $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') ||
@@ -117,32 +117,41 @@ sub handler {
                 if ($query) {
 		    &Apache::loncommon::get_unprocessed_cgi($query,['symb']);
                 }
-                if ($ENV{'form.symb'}) {
-		    $symb=&Apache::lonnet::symbclean($ENV{'form.symb'});
+                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 => $mid,
-                                               'last_known' => $murl);
+                        &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 => $mid,
-                                               'last_known' => $murl);
+                      &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($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 =>[$murl,$mid],
+						'last_known' =>[$murl,$mid]);
+		    }
                 }
-                $ENV{'request.symb'}=$symb;
+                $env{'request.symb'}=$symb;
                 &Apache::lonnet::courseacclog($symb);
             } else {
 # ------------------------------------------------------- This is other content
@@ -159,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);
-	$ENV{'user.name'}='public';
-        $ENV{'user.domain'}='public';
-        $ENV{'request.state'} = "published";
-        $ENV{'request.publicaccess'} = 1;
-        $ENV{'request.filename'} = $r->filename;
+	&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;
+	$env{'request.querystring'}=$r->args;
+	$env{'request.firsturl'}=$requrl;
        return FORBIDDEN;
-   } else {
+#   } else {
 # --------------------------------------------------------------------- Goodbye
-       return HTTP_BAD_REQUEST;
-   }
+#       return HTTP_BAD_REQUEST;
+#   }
 }
 
 1;
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>500 Internal Server Error</title>
</head><body>
<h1>Internal Server Error</h1>
<p>The server encountered an internal error or
misconfiguration and was unable to complete
your request.</p>
<p>Please contact the server administrator at 
 root@localhost to inform them of the time this error occurred,
 and the actions you performed just before this error.</p>
<p>More information about this error may be available
in the server error log.</p>
</body></html>