--- loncom/auth/lonacc.pm	2021/02/10 11:22:41	1.159.2.8.2.10
+++ loncom/auth/lonacc.pm	2021/02/09 22:17:40	1.187
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.159.2.8.2.10 2021/02/10 11:22:41 raeburn Exp $
+# $Id: lonacc.pm,v 1.187 2021/02/09 22:17:40 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);
 
@@ -202,6 +203,14 @@ sub get_posted_cgi {
 			$fname='';
 			$fmime='';
 		    }
+                    if ($i<$#lines && $lines[$i+1]=~/^Content\-Type\:\s*([\w\-\/]+)/i) {
+                        # TODO: something with $1 !
+                        $i++;
+                    }
+                    if ($i<$#lines && $lines[$i+1]=~/^Content\-transfer\-encoding\:\s*([\w\-\/]+)/i) {
+                        # TODO: something with $1 !
+                        $i++;
+                    }
 		    $i++;
 		}
 	    } else {
@@ -377,7 +386,7 @@ sub sso_login {
 	} else {
 	    # need to login them in, so generate the need data that
 	    # migrate expects to do login
-            my $ip = &Apache::lonnet::get_requestor_ip($r);
+	    my $ip = &Apache::lonnet::get_requestor_ip($r);
 	    my %info=('ip'        => $ip,
 		      'domain'    => $domain,
 		      'username'  => $user,
@@ -528,7 +537,8 @@ sub handler {
             }
         } elsif ($env{'request.course.id'} &&
                  (($requrl =~ m{^/adm/$match_domain/$match_username/aboutme$}) ||
-                  ($requrl =~ m{^/public/$cdom/$cnum/syllabus$}))) {
+                  ($requrl eq "/public/$cdom/$cnum/syllabus") ||
+                  ($requrl =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}))) {
             my $query = $r->args;
             if ($query) {
                 foreach my $pair (split(/&/,$query)) {
@@ -582,7 +592,7 @@ sub handler {
                 if (($found_server) && ($balancer_cookie =~ /^\Q$env{'user.domain'}\E_\Q$env{'user.name'}\E_/)) {
                     $otherserver = $found_server;
                 }
-                unless ($requrl eq '/adm/switchserver') {
+                unless ($requrl eq '/adm/switchserver') { 
                     $r->set_handlers('PerlResponseHandler'=>
                                      [\&Apache::switchserver::handler]);
                 }
@@ -604,7 +614,6 @@ sub handler {
                 return OK;
             }
         }
-
 # ---------------------------------------------------------------- Check access
 	my $now = time;
         my ($check_symb,$check_access,$check_block,$access,$poss_symb);
@@ -711,6 +720,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);
@@ -727,7 +740,7 @@ sub handler {
                         }
                     }
                 } elsif (($handle =~ /^publicuser_\d+$/) && (&Apache::lonnet::is_portfolio_url($requrl))) {
-                    my $clientip = &Apache::lonnet::get_requestor_ip($r);
+                    my $clientip = &Apache::lonnet::get_requestor_ip($r); 
                     if (&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip) ne 'F') {
                         $env{'user.error.msg'}="$requrl:bre:1:1:Access Denied";
                         return HTTP_NOT_ACCEPTABLE;
@@ -796,7 +809,7 @@ sub handler {
                                 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);
+                                    ($map,$mid,$murl)=&Apache::lonnet::decode_symb($mapsymb); 
                                 }
                                 &Apache::lonnet::symblist($map,$murl => [$murl,$mid],
                                                           'last_known' =>[$murl,$mid]);
@@ -882,8 +895,8 @@ sub handler {
                                 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]);
+			    &Apache::lonnet::symblist($map,$murl =>[$murl,$mid],
+						      'last_known' =>[$murl,$mid]);
                         }
 		    }
 		}
@@ -936,7 +949,7 @@ sub handler {
 # ------------------------------------ See if this is a viewable portfolio file
     if (&Apache::lonnet::is_portfolio_url($requrl)) {
         my $clientip = &Apache::lonnet::get_requestor_ip($r);
-	my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip);
+        my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip);
 	if ($access eq 'A') {
 	    &Apache::restrictedaccess::setup_handler($r);
 	    return OK;