--- loncom/auth/lonacc.pm	2020/09/28 01:31:42	1.159.2.11
+++ loncom/auth/lonacc.pm	2018/01/12 13:33:46	1.169
@@ -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.169 2018/01/12 13:33:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -202,6 +202,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 {
@@ -281,6 +289,7 @@ sub upload_size_allowed {
 sub sso_login {
     my ($r,$handle,$username) = @_;
 
+    my $lonidsdir=$r->dir_config('lonIDsDir');
     if (($r->user eq '') || ($username ne '') || ($r->user eq 'public:public') ||
         (defined($env{'user.name'}) && (defined($env{'user.domain'}))
 	  && ($handle ne ''))) {
@@ -332,21 +341,17 @@ sub sso_login {
             ($is_balancer,$otherserver) =
                 &Apache::lonnet::check_loadbalancing($user,$domain,'login');
             if ($is_balancer) {
-                # Check if browser sent a LON-CAPA load balancer cookie (and this is a balancer)
-                my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r);
-                if (($found_server) && ($balancer_cookie =~ /^\Q$domain\E_\Q$user\E_/)) {
-                    $otherserver = $found_server;
-                } elsif ($otherserver eq '') {
+                if ($otherserver eq '') {
                     my $lowest_load;
                     ($otherserver,undef,undef,undef,$lowest_load) = &Apache::lonnet::choose_server($domain);
                     if ($lowest_load > 100) {
                         $otherserver = &Apache::lonnet::spareserver($lowest_load,$lowest_load,1,$domain);
                     }
-                    if ($otherserver ne '') {
-                        my @hosts = &Apache::lonnet::current_machine_ids();
-                        if (grep(/^\Q$otherserver\E$/,@hosts)) {
-                            $hosthere = $otherserver;
-                        }
+                }
+                if ($otherserver ne '') {
+                    my @hosts = &Apache::lonnet::current_machine_ids();
+                    if (grep(/^\Q$otherserver\E$/,@hosts)) {
+                        $hosthere = $otherserver;
                     }
                 }
             }
@@ -369,7 +374,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 +440,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;
@@ -517,7 +506,7 @@ sub handler {
                 my $preserved;
                 foreach my $pair (split(/&/,$query)) {
                     my ($name, $value) = split(/=/,$pair);
-                    unless (($name eq 'symb') || ($name eq 'usehttp')) {
+                    unless ($name eq 'symb') {
                         $preserved .= $pair.'&';
                     }
                     if (($env{'request.course.id'}) && ($name eq 'folderpath')) {
@@ -536,7 +525,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)) {
@@ -572,7 +562,7 @@ sub handler {
         my $checkexempt;
         if ($env{'user.loadbalexempt'} eq $r->dir_config('lonHostID')) {
             if ($env{'user.loadbalcheck.time'} + 600 > time) {
-                $checkexempt = 1;
+                $checkexempt = 1;    
             }
         }
         if ($env{'user.noloadbalance'} eq $r->dir_config('lonHostID')) {
@@ -582,65 +572,26 @@ sub handler {
             ($is_balancer,$otherserver) =
                 &Apache::lonnet::check_loadbalancing($env{'user.name'},
                                                      $env{'user.domain'});
-            if ($is_balancer) {
-                unless (($requrl eq '/adm/switchserver') && (!$r->is_initial_req())) {
-                    # Check if browser sent a LON-CAPA load balancer cookie (and this is a balancer)
-                    my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r);
-                    if (($found_server) && ($balancer_cookie =~ /^\Q$env{'user.domain'}\E_\Q$env{'user.name'}\E_/)) {
-                        $otherserver = $found_server;
-                    }
-                }
-            }
         }
         if ($is_balancer) {
-            unless (($requrl eq '/adm/switchserver') && (!$r->is_initial_req())) {
-                $r->set_handlers('PerlResponseHandler'=>
-                                 [\&Apache::switchserver::handler]);
-                if ($otherserver ne '') {
-                    $env{'form.otherserver'} = $otherserver;
-                }
+            $r->set_handlers('PerlResponseHandler'=>
+                             [\&Apache::switchserver::handler]);
+            if ($otherserver ne '') {
+                $env{'form.otherserver'} = $otherserver;
             }
             unless (($env{'form.origurl'}) || ($r->uri eq '/adm/roles') ||
                     ($r->uri eq '/adm/switchserver') || ($r->uri eq '/adm/sso')) {
                 $env{'form.origurl'} = $r->uri;
             }
         }
-
+        if ($requrl=~m{^/+tiny/+$match_domain/+\w+$}) {
+            return OK;
+        }
 # ---------------------------------------------------------------- Check access
 	my $now = time;
-	if ($requrl !~ m{^/(?:adm|public|(?:prt|zip)spool)/}
+	if ($requrl !~ m{^/(?:adm|public|prtspool)/}
 	    || $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,14 +608,6 @@ 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;
             }
@@ -724,8 +667,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,16 +685,9 @@ sub handler {
 		}
 		if ($env{'form.symb'}) {
 		    $symb=&Apache::lonnet::symbclean($env{'form.symb'});
-                    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/|
+		    if ($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)) ||
@@ -751,10 +696,6 @@ 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 {
@@ -770,58 +711,22 @@ 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);
-                            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]);
-                            }
+			    &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 +772,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;