--- loncom/auth/lonacc.pm	2020/09/02 02:21:37	1.159.2.8.2.3
+++ loncom/auth/lonacc.pm	2020/09/30 20:03:12	1.159.2.8.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.159.2.8.2.3 2020/09/02 02:21:37 raeburn Exp $
+# $Id: lonacc.pm,v 1.159.2.8.2.4 2020/09/30 20:03:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -537,6 +537,7 @@ sub handler {
                         if ($value =~ /^supplemental/) {
                             $suppext = 1;
                         }
+                        last;
                     }
                 }
             }
@@ -610,9 +611,57 @@ sub handler {
 
 # ---------------------------------------------------------------- Check access
 	my $now = time;
+        my $check_symb;
 	if ($requrl !~ m{^/(?:adm|public|(?:prt|zip)spool)/}
 	    || $requrl =~ /^\/adm\/.*\/(smppg|bulletinboard)(\?|$ )/x) {
-	    my $access=&Apache::lonnet::allowed('bre',$requrl);
+            my ($access,$poss_symb);
+            if (($env{'request.course.id'}) && (!$suppext)) {
+                $requrl=~/\.(\w+)$/;
+                if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
+                    ($requrl=~/^\/adm\/.*\/(aboutme|smppg|bulletinboard)(\?|$ )/x) ||
+                    ($requrl=~/^\/adm\/wrapper\//) ||
+                    ($requrl=~m|^/adm/coursedocs/showdoc/|) ||
+                    ($requrl=~m|\.problem/smpedit$|) ||
+                    ($requrl=~/^\/public\/.*\/syllabus$/) ||
+                    ($requrl=~/^\/adm\/(viewclasslist|navmaps)$/) ||
+                    ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/)) {
+                    $check_symb = 1;
+                }
+            }
+            if ($check_symb) {
+                if ($env{'form.symb'}) {
+                    $poss_symb=&Apache::lonnet::symbclean($env{'form.symb'});
+                } elsif (($env{'request.course.id'}) && ($r->args ne '')) {
+                    my $query = $r->args;
+                    foreach my $pair (split(/&/,$query)) {
+                        my ($name, $value) = split(/=/,$pair);
+                        if ($name eq 'symb') {
+                            $poss_symb = &Apache::lonnet::symbclean($value);
+                            last;
+                        }
+                    }
+                }
+                if ($poss_symb) {
+                    my ($possmap,$resid,$url)=&Apache::lonnet::decode_symb($poss_symb);
+                    $url = &Apache::lonnet::clutter($url);
+                    unless (($url eq $requrl) && (&Apache::lonnet::is_on_map($possmap))) {
+                        undef($poss_symb);
+                    }
+                    if ($poss_symb) {
+                        if ((!$env{'request.role.adv'}) && ($env{'acc.randomout'}) &&
+                            ($env{'acc.randomout'}=~/\&\Q$poss_symb\E\&/)) {
+                            undef($poss_symb);
+                        }
+                    }
+                }
+                if ($poss_symb) {
+                    $access=&Apache::lonnet::allowed('bre',$requrl,$poss_symb);
+                } else {
+                    $access=&Apache::lonnet::allowed('bre',$requrl,'','','','',1);
+                }
+            } else {
+                $access=&Apache::lonnet::allowed('bre',$requrl);
+            }
             if ($handle eq '') {
                 unless ($access eq 'F') {
                     if ($requrl =~ m{^/res/$match_domain/$match_username/}) {
@@ -629,6 +678,14 @@ sub handler {
 		return OK;
 	    }
             if ($access eq 'B') {
+                if ($poss_symb) {
+                    if ($requrl=~m{^(/adm/.*/aboutme)/portfolio$}) {
+                        $requrl = $1;
+                    }
+                    if (&Apache::lonnet::symbverify($poss_symb,$requrl)) {
+                        $env{'request.symb'} = $poss_symb;
+                    }
+                }
                 &Apache::blockedaccess::setup_handler($r);
                 return OK;
             }
@@ -679,7 +736,7 @@ sub handler {
 	    $env{'user.domain'} eq 'public' &&
 	    $requrl !~ m{^/+(res|public|uploaded)/} &&
 	    $requrl !~ m{^/adm/[^/]+/[^/]+/aboutme/portfolio$ }x &&
-        $requrl !~ m{^/adm/blockingstatus/.*$} &&
+            $requrl !~ m{^/adm/blockingstatus/.*$} &&
 	    $requrl !~ m{^/+adm/(help|logout|restrictedaccess|randomlabel\.png)}) {
 	    $env{'request.querystring'}=$r->args;
 	    $env{'request.firsturl'}=$requrl;
@@ -688,16 +745,8 @@ sub handler {
 # ------------------------------------------------------------- This is allowed
 	if ($env{'request.course.id'}) {
 	    &Apache::lonnet::countacc($requrl);
-	    $requrl=~/\.(\w+)$/;
             my $query=$r->args;
-	    if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
-		($requrl=~/^\/adm\/.*\/(aboutme|smppg|bulletinboard)(\?|$ )/x) ||
-		($requrl=~/^\/adm\/wrapper\//) ||
-		($requrl=~m|^/adm/coursedocs/showdoc/|) ||
-		($requrl=~m|\.problem/smpedit$|) ||
-		($requrl=~/^\/public\/.*\/syllabus$/) ||
-                ($requrl=~/^\/adm\/(viewclasslist|navmaps)$/) ||
-                ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/)) {
+            if ($check_symb) {
 # ------------------------------------- This is serious stuff, get symb and log
 		my $symb;
 		if ($query) {
@@ -740,32 +789,58 @@ sub handler {
                     if ($requrl=~m{^(/adm/.*/aboutme)/portfolio$}) {
                         $requrl = $1;
                     }
-                    unless ($suppext) {
-		        $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);
-                            if ($requrl eq '/adm/navmaps') {
-                                &Apache::lonnet::symblist($map,$murl =>[$murl,$mid]);
-                            } else {
-                                if (($map =~ /\.page$/) && ($requrl !~ /\.page$/)) {
-                                    my $mapsymb = &Apache::lonnet::symbread($map);
-                                    ($map,$mid,$murl)=&Apache::lonnet::decode_symb($mapsymb);
+		    $symb=&Apache::lonnet::symbread($requrl);
+                    if (&Apache::lonnet::is_on_map($requrl) && $symb) {
+                        my ($encstate,$invalidsymb);
+                        unless (&Apache::lonnet::symbverify($symb,$requrl,\$encstate)) {
+                            $invalidsymb = 1;
+                            #
+                            # If $env{'request.enc'} is true, but no encryption for $symb retrieved
+                            # by original lonnet::symbread() call, call again to check for an instance
+                            # of $requrl in the course which has encryption, and set that as the symb.
+                            # If there is no such symb, or symbverify() fails for the new symb proceed
+                            # to report invalid symb.
+                            #
+                            if ($env{'request.enc'} && !$encstate) {
+                                my %possibles;
+                                my $nocache = 1;
+                                $symb = &Apache::lonnet::symbread($requrl,'','','',\%possibles,$nocache);
+                                if ($symb) {
+                                    if (&Apache::lonnet::symbverify($symb,$requrl)) {
+                                        $invalidsymb = '';
+                                    }
+                                } elsif (keys(%possibles) > 1) {
+                                    $r->internal_redirect('/adm/ambiguous');
+                                    return OK;
                                 }
-                                &Apache::lonnet::symblist($map,$murl =>[$murl,$mid],
-                                                          'last_known' =>[$murl,$mid]);
                             }
-		        }
+                            if ($invalidsymb) {
+                                $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);
+                        if ($requrl eq '/adm/navmaps') {
+                            &Apache::lonnet::symblist($map,$murl =>[$murl,$mid]);
+                        } else {
+                            if (($map =~ /\.page$/) && ($requrl !~ /\.page$/)) {
+                                my $mapsymb = &Apache::lonnet::symbread($map);
+                                ($map,$mid,$murl)=&Apache::lonnet::decode_symb($mapsymb);
+                            }
+                            &Apache::lonnet::symblist($map,$murl =>[$murl,$mid],
+                                                      'last_known' =>[$murl,$mid]);
+                        }
 		    }
 		}
 		$env{'request.symb'}=$symb;
+                if (($env{'request.symbread.cached.'}) && ($env{'request.symbread.cached.'} ne $symb)) {
+                    $env{'request.symbread.cached.'} = $symb;
+                }
 		&Apache::lonnet::courseacclog($symb);
 	    } else {
 # ------------------------------------------------------- This is other content