--- loncom/auth/lonacc.pm	2018/12/17 21:43:05	1.172
+++ loncom/auth/lonacc.pm	2020/08/10 03:22:54	1.178
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.172 2018/12/17 21:43:05 raeburn Exp $
+# $Id: lonacc.pm,v 1.178 2020/08/10 03:22:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -102,6 +102,7 @@ use Apache::loncommon();
 use Apache::lonlocal;
 use Apache::restrictedaccess();
 use Apache::blockedaccess();
+use Apache::lonprotected();
 use Fcntl qw(:flock);
 use LONCAPA qw(:DEFAULT :match);
 
@@ -517,7 +518,7 @@ sub handler {
                 my $preserved;
                 foreach my $pair (split(/&/,$query)) {
                     my ($name, $value) = split(/=/,$pair);
-                    unless ($name eq 'symb') {
+                    unless (($name eq 'symb') || ($name eq 'usehttp')) {
                         $preserved .= $pair.'&';
                     }
                     if (($env{'request.course.id'}) && ($name eq 'folderpath')) {
@@ -558,6 +559,7 @@ sub handler {
             my $lonhost = &Apache::lonnet::host_from_dns($hostname);
             if ($lonhost) {
                 my $actual = &Apache::lonnet::absolute_url($hostname);
+                my $exphostname = &Apache::lonnet::hostname($lonhost);
                 my $expected = $Apache::lonnet::protocol{$lonhost}.'://'.$hostname;
                 unless ($actual eq $expected) {
                     $env{'request.use_absolute'} = $expected;
@@ -607,11 +609,17 @@ sub handler {
             }
         }
         if ($requrl=~m{^/+tiny/+$match_domain/+\w+$}) {
-            return OK;
+            if ($env{'user.name'} eq 'public' &&
+                $env{'user.domain'} eq 'public') {
+                $env{'request.firsturl'}=$requrl;
+                return FORBIDDEN;
+            } else {
+                return OK;
+            }
         }
 # ---------------------------------------------------------------- Check access
 	my $now = time;
-	if ($requrl !~ m{^/(?:adm|public|prtspool)/}
+	if ($requrl !~ m{^/(?:adm|public|(?:prt|zip)spool)/}
 	    || $requrl =~ /^\/adm\/.*\/(smppg|bulletinboard)(\?|$ )/x) {
 	    my $access=&Apache::lonnet::allowed('bre',$requrl);
             if ($handle eq '') {
@@ -633,6 +641,10 @@ sub handler {
                 &Apache::blockedaccess::setup_handler($r);
                 return OK;
             }
+            if ($access eq 'D') {
+                &Apache::lonprotected::setup_handler($r);
+                return OK;
+            }
 	    if (($access ne '2') && ($access ne 'F')) {
                 if ($requrl =~ m{^/res/}) {
                     $access = &Apache::lonnet::allowed('bro',$requrl);
@@ -707,9 +719,16 @@ sub handler {
 		}
 		if ($env{'form.symb'}) {
 		    $symb=&Apache::lonnet::symbclean($env{'form.symb'});
-		    if ($requrl =~ m|^/adm/wrapper/|
+		    if ($requrl eq '/adm/navmaps') {
+                        my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);
+                        &Apache::lonnet::symblist($map,$murl => [$murl,$mid]);
+		    } elsif ($requrl =~ m|^/adm/wrapper/|
 			|| $requrl =~ m|^/adm/coursedocs/showdoc/|) {
 			my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);
+                        if ($map =~ /\.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]);
 		    } elsif ((&Apache::lonnet::symbverify($symb,$requrl)) ||
@@ -718,6 +737,10 @@ sub handler {
                              (($requrl=~m|(.*/aboutme)/portfolio$|) &&
                               &Apache::lonnet::symbverify($symb,$1))) {
 			my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);
+                        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]);
 		    } else {
@@ -743,8 +766,16 @@ sub handler {
 		        if ($symb) {
 			    my ($map,$mid,$murl)=
 			        &Apache::lonnet::decode_symb($symb);
-			    &Apache::lonnet::symblist($map,$murl =>[$murl,$mid],
-						      'last_known' =>[$murl,$mid]);
+                            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]);
+                            }
 		        }
 		    }
 		}