--- loncom/auth/lonacc.pm	2020/09/28 01:31:42	1.159.2.11
+++ 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.159.2.11 2020/09/28 01:31:42 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);
 
@@ -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 {
@@ -355,6 +364,14 @@ sub sso_login {
 	    # login but immediately go to switch server to find us a new 
 	    # machine
 	    &Apache::lonauth::success($r,$user,$domain,$home,'noredirect');
+            foreach my $item (keys(%form)) {
+                $env{'form.'.$item} = $form{$item};
+            }
+            unless ($form{'symb'}) {
+                unless (($r->uri eq '/adm/roles') || ($r->uri eq '/adm/sso')) {
+                    $env{'form.origurl'} = $r->uri;
+                }
+            }
             $env{'request.sso.login'} = 1;
             if (defined($r->dir_config("lonSSOReloginServer"))) {
                 $env{'request.sso.reloginserver'} =
@@ -369,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 = $r->get_remote_host();
+	    my $ip = $r->get_remote_host();
 	    my %info=('ip'        => $ip,
 		      'domain'    => $domain,
 		      'username'  => $user,
@@ -435,22 +452,6 @@ sub sso_login {
     return undef;
 }
 
-sub needs_symb_check {
-    my ($requrl) = @_;
-    $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(\?|$)/)) {
-        return 1;
-    }
-    return;
-}
-
 sub handler {
     my $r = shift;
     my $requrl=$r->uri;
@@ -536,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)) {
@@ -557,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;
@@ -605,42 +608,20 @@ sub handler {
                 $env{'form.origurl'} = $r->uri;
             }
         }
-
+        if ($requrl=~m{^/+tiny/+$match_domain/+\w+$}) {
+            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|(?:prt|zip)spool)/}
 	    || $requrl =~ /^\/adm\/.*\/(smppg|bulletinboard)(\?|$ )/x) {
-            my ($access,$poss_symb);
-            if (($env{'request.course.id'}) && (!$suppext) && (&needs_symb_check($requrl))) {
-                unless ($env{'form.symb'}) {
-                    if ($r->args) {
-                        &Apache::loncommon::get_unprocessed_cgi($r->args,['symb']);
-                    }
-                }
-                if ($env{'form.symb'}) {
-                    $poss_symb=&Apache::lonnet::symbclean($env{'form.symb'});
-                }
-                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);
-            }
+	    my $access=&Apache::lonnet::allowed('bre',$requrl);
             if ($handle eq '') {
                 unless ($access eq 'F') {
                     if ($requrl =~ m{^/res/$match_domain/$match_username/}) {
@@ -657,17 +638,13 @@ 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;
             }
+            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);
@@ -724,8 +701,17 @@ sub handler {
 # ------------------------------------------------------------- This is allowed
 	if ($env{'request.course.id'}) {
 	    &Apache::lonnet::countacc($requrl);
+	    $requrl=~/\.(\w+)$/;
             my $query=$r->args;
-            if (&needs_symb_check($requrl)) {
+	    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(\?|$)/) ||
+                ($requrl=~m{^/adm/$cdom/$cnum/\d+/ext\.tool$})) {
 # ------------------------------------- This is serious stuff, get symb and log
 		my $symb;
 		if ($query) {
@@ -733,15 +719,15 @@ sub handler {
 		}
 		if ($env{'form.symb'}) {
 		    $symb=&Apache::lonnet::symbclean($env{'form.symb'});
-                    if ($requrl eq '/adm/navmaps') {
+		    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/|
+		    } 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);
+                            ($map,$mid,$murl)=&Apache::lonnet::decode_symb($mapsymb); 
                         }
 			&Apache::lonnet::symblist($map,$murl => [$murl,$mid],
 						  'last_known' =>[$murl,$mid]);
@@ -770,38 +756,13 @@ sub handler {
                     }
                     unless ($suppext) {
 		        $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;
-                                    }
-                                }
-                                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 (&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);
@@ -812,16 +773,13 @@ 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]);
                             }
 		        }
 		    }
 		}
 		$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
@@ -867,7 +825,7 @@ sub handler {
 # ------------------------------------ See if this is a viewable portfolio file
     if (&Apache::lonnet::is_portfolio_url($requrl)) {
         my $clientip = $r->get_remote_host();
-	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;