--- loncom/auth/lonacc.pm	2022/08/30 11:58:44	1.159.2.21.2.3
+++ loncom/auth/lonacc.pm	2021/11/03 01:04:02	1.200
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.159.2.21.2.3 2022/08/30 11:58:44 raeburn Exp $
+# $Id: lonacc.pm,v 1.200 2021/11/03 01:04:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -160,8 +160,7 @@ sub get_posted_cgi {
                         if (length($value) == 1) {
                             $value=~s/[\r\n]$//;
                         }
-                    }
-                    if ($fname =~ /\.(xls|doc|ppt)(x|m)$/i) {
+                    } elsif ($fname =~ /\.(xls|doc|ppt)(x|m)$/i) {
                         $value=~s/[\r\n]$//;
                     }
                     if (ref($fields) eq 'ARRAY') {
@@ -204,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 {
@@ -273,18 +280,10 @@ sub upload_size_allowed {
         be identified by the third arg ($usename), except when lonacc is called in 
         an internal redirect to /adm/switchserver (e.g., load-balancing following
         successful authentication) -- no cookie set yet.  For that particular case
-        simply skip the call to sso_login().
+        simply skip the call to sso_login(). 
 
 	returns OK if it was SSO and user was handled.
         returns undef if not SSO or no means to handle the user.
-
-        In the case where the session was started from /adm/launch/tiny/$domain/$id,
-        i.e., for a protected link, with launch from another CMS, and user information
-        is accepted from the LTI payload, then, if the user has privileged roles,
-        authentication will be required.  If SSO authentication is with a username
-        and/or domain that differ from the username in the LTI payload and domain
-        in the launch URL, then $r->user() will be unset and /adm/relaunch will be
-        called.
         
 =cut
 
@@ -306,9 +305,8 @@ sub sso_login {
     my $query = $r->args;
     my %form;
     if ($query) {
-
         my @items = ('role','symb','iptoken','origurl','ttoken',
-                     'ltoken','linkkey','logtoken','sso','lcssowin');
+                     'ltoken','linkkey','logtoken','sso');
         &Apache::loncommon::get_unprocessed_cgi($query,\@items);
         foreach my $item (@items) {
             if (defined($env{'form.'.$item})) {
@@ -326,7 +324,7 @@ sub sso_login {
         }
     }
 
-    my ($linkprot,$linkprotuser,$linkprotexit,$linkkey,$deeplinkurl);
+    my ($linkprot,$linkkey);
 
 #
 # If Shibboleth auth is in use, and a dual SSO and non-SSO login page
@@ -358,14 +356,9 @@ sub sso_login {
         &Apache::lonnet::tmpdel($form{'ttoken'});
         if ($info{'origurl'}) {
             $form{'origurl'} = $info{'origurl'};
-            if ($form{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) {
-                $deeplinkurl = $form{'origurl'};
-            }
         }
         if ($info{'linkprot'}) {
             $linkprot = $info{'linkprot'};
-            $linkprotuser = $info{'linkprotuser'};
-            $linkprotexit = $info{'linkprotexit'};
         } elsif ($info{'linkkey'} ne '') {
             $linkkey = $info{'linkkey'};
         }
@@ -386,12 +379,9 @@ sub sso_login {
             }
             if ($firsturl =~ m{^/tiny/$match_domain/\w+$}) {
                 $form{'origurl'} = $firsturl;
-                $deeplinkurl = $firsturl;
             }
             if ($form{'linkprot'}) {
                 $linkprot = $form{'linkprot'};
-                $linkprotuser = $form{'linkprotuser'};
-                $linkprotexit = $form{'linkprotexit'};
             } elsif ($form{'linkkey'} ne '') {
                 $linkkey = $form{'linkkey'};
             }
@@ -409,9 +399,6 @@ sub sso_login {
             my ($firsturl,@rest)=split(/\&/,$info);
             if ($firsturl ne '') {
                 $form{'origurl'} = &unescape($firsturl);
-                if ($form{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) {
-                    $deeplinkurl = $form{'origurl'};
-                }
             }
             foreach my $item (@rest) {
                 my ($key,$value) = split(/=/,$item);
@@ -419,8 +406,6 @@ sub sso_login {
             }
             if ($form{'linkprot'}) {
                 $linkprot = $form{'linkprot'};
-                $linkprotuser = $form{'linkprotuser'};
-                $linkprotexit = $form{'linkprotexit'};
             } elsif ($form{'linkkey'} ne '') {
                 $linkkey = $form{'linkkey'};
             }
@@ -428,19 +413,8 @@ sub sso_login {
     } elsif ($form{'ltoken'}) {
         my %link_info = &Apache::lonnet::tmpget($form{'ltoken'});
         $linkprot = $link_info{'linkprot'};
-        if ($linkprot) {
-            if ($link_info{'linkprotuser'} ne '') {
-                $linkprotuser = $link_info{'linkprotuser'};
-            }
-            if ($link_info{'linkprotexit'} ne '') {
-                $linkprotexit = $link_info{'linkprotexit'};
-            }
-        }
         my $delete = &Apache::lonnet::tmpdel($form{'ltoken'});
         delete($form{'ltoken'});
-        if ($form{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) {
-            $deeplinkurl = $form{'origurl'};
-        }
     } elsif ($form{'linkkey'} ne '') {
         $linkkey = $form{'linkkey'};
     }
@@ -449,27 +423,6 @@ sub sso_login {
     if ($domain eq '') {
         $domain = $r->dir_config('lonDefDomain');
     }
-    if (($deeplinkurl) && ($linkprot) && ($linkprotuser ne '')) {
-        unless ($linkprotuser eq $user.':'.$domain) {
-            $r->user();
-            my %data = (
-                           origurl => $deeplinkurl,
-                           linkprot => $linkprot,
-                           linkprotuser => $linkprotuser,
-                           linkprotexit => $linkprotexit,
-                       );
-            if ($env{'form.lcssowin'}) {
-                $data{'lcssowin'} = $env{'form.lcssowin'};
-            }
-            my $token = &Apache::lonnet::tmpput(\%data,$r->dir_config('lonHostID'),'link');
-            unless (($token eq 'con_lost') || ($token eq 'refused') || ($token =~ /^error:/) ||
-                    ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) {
-                $r->internal_redirect('/adm/relaunch?rtoken='.$token);
-                $r->set_handlers('PerlHandler'=> undef);
-                return OK;
-            }
-        }
-    }
     my $home=&Apache::lonnet::homeserver($user,$domain);
     if ($home !~ /(con_lost|no_host|no_such_host)/) {
 	&Apache::lonnet::logthis(" SSO authorized user $user ");
@@ -523,12 +476,6 @@ sub sso_login {
             if ($env{'request.deeplink.login'}) {
                 if ($linkprot) {
                     $env{'request.linkprot'} = $linkprot;
-                    if ($linkprotuser ne '') {
-                        $env{'request.linkprotuser'} = $linkprotuser;
-                    }
-                    if ($linkprotexit ne '') {
-                        $env{'request.linkprotexit'} = $linkprotexit;
-                    }
                 } elsif ($linkkey ne '') {
                     $env{'request.linkkey'} = $linkkey;
                 }
@@ -542,22 +489,19 @@ sub sso_login {
             if ($otherserver ne '') {
                 $redirecturl .= '?otherserver='.$otherserver;
             }
-            if ($form{'lcssowin'}) {
-                $redirecturl .= (($redirecturl=~/\?/)?'&':'?') . 'lcssowin=1';
-            }
 	    $r->internal_redirect($redirecturl);
 	    $r->set_handlers('PerlHandler'=> undef);
 	} 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,
 		      'server'    => $r->dir_config('lonHostID'),
 		      'sso.login' => 1
 		      );
-            foreach my $item ('role','symb','iptoken','origurl','lcssowin') {
+            foreach my $item ('role','symb','iptoken','origurl') {
                 if (exists($form{$item})) {
                     $info{$item} = $form{$item};
                 } elsif ($sessiondata{$item} ne '') {
@@ -577,12 +521,6 @@ sub sso_login {
             if ($info{'deeplink.login'}) {
                 if ($linkprot) {
                     $info{'linkprot'} = $linkprot;
-                    if ($linkprotuser ne '') {
-                        $info{'linkprotuser'} = $linkprotuser;
-                    }
-                    if ($linkprotexit ne '') {
-                        $info{'linkprotexit'} = $linkprotexit;
-                    }
                 } elsif ($linkkey ne '') {
                     $info{'linkkey'} = $linkkey;
                 }
@@ -597,7 +535,9 @@ sub sso_login {
             if (($is_balancer) && ($hosthere)) {
                 $info{'noloadbalance'} = $hosthere;
             }
-	    my $token = &Apache::lonnet::tmpput(\%info,$r->dir_config('lonHostID'),'sso');
+	    my $token = 
+		&Apache::lonnet::tmpput(\%info,
+					$r->dir_config('lonHostID'));
 	    $env{'form.token'} = $token;
 	    $r->internal_redirect('/adm/migrateuser');
 	    $r->set_handlers('PerlHandler'=> undef);
@@ -623,7 +563,7 @@ sub sso_login {
             $r->subprocess_env->set('SSOUserDomain' => $domain);
             if (grep(/^sso$/,@cancreate)) {
 #FIXME - need to preserve origurl, role and symb, or linkprot or linkkey for use after account
-# creation. If lcssowin is 1, createaccount needs to close pop-up and display in main window.
+# creation
                 $r->set_handlers('PerlHandler'=> [\&Apache::createaccount::handler]);
                 $r->handler('perl-script');
             } else {
@@ -721,7 +661,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)) {
@@ -743,6 +684,7 @@ sub handler {
             my $lonhost = &Apache::lonnet::host_from_dns($hostname);
             if ($lonhost) {
                 my $actual = &Apache::lonnet::absolute_url($hostname,1,1);
+                my $exphostname = &Apache::lonnet::hostname($lonhost);
                 my $expected = $Apache::lonnet::protocol{$lonhost}.'://'.$hostname;
                 unless ($actual eq $expected) {
                     $env{'request.use_absolute'} = $expected;
@@ -788,55 +730,13 @@ sub handler {
             }
         }
         if ($requrl=~m{^/+tiny/+$match_domain/+\w+$}) {
-            if ($r->args) {
-                &Apache::loncommon::get_unprocessed_cgi($r->args,['ttoken']);
-                if (defined($env{'form.ttoken'})) {
-                    my %info = &Apache::lonnet::tmpget($env{'form.ttoken'});
-                    if (($info{'origurl'} ne '') && ($info{'origurl'} eq $requrl)) {
-                        my %data;
-                        if (($info{'linkprotuser'} ne '') && ($info{'linkprot'}) &&
-                            ($info{'linkprotuser'} ne $env{'user.name'}.':'.$env{'user.domain'})) {
-                            %data = (
-                                origurl => $requrl,
-                                linkprot => $info{'linkprot'},
-                                linkprotuser => $info{'linkprotuser'},
-                                linkprotexit => $info{'linkprotexit'},
-                            );
-                        } elsif ($info{'ltoken'} ne '') {
-                            my %ltoken_info = &Apache::lonnet::tmpget($info{'ltoken'});
-                            if (($ltoken_info{'linkprotuser'} ne '') && ($ltoken_info{'linkprot'}) &&
-                                ($ltoken_info{'linkprotuser'} ne $env{'user.name'}.':'.$env{'user.domain'})) {
-                                %data = (
-                                    origurl => $requrl,
-                                    linkprot => $ltoken_info{'linkprot'},
-                                    linkprotuser => $ltoken_info{'linkprotuser'},
-                                    linkprotexit => $ltoken_info{'linkprotexit'},
-                                );
-                            }
-                        }
-                        if (keys(%data)) {
-                            my $delete = &Apache::lonnet::tmpdel($env{'form.ttoken'});
-                            if ($info{'ltoken'} ne '') {
-                                my $delete = &Apache::lonnet::tmpdel($info{'ltoken'});
-                            }
-                            my $token =
-                                &Apache::lonnet::tmpput(\%data,$r->dir_config('lonHostID'),'retry');
-                            unless (($token eq 'con_lost') || ($token eq 'refused') || ($token =~ /^error:/) ||
-                                    ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) {
-                                $r->internal_redirect('/adm/relaunch?rtoken='.$token);
-                                $r->set_handlers('PerlHandler'=> undef);
-                                return OK;
-                            }
-                        }
-                    }
-                }
-            }
             if ($env{'user.name'} eq 'public' &&
                 $env{'user.domain'} eq 'public') {
                 $env{'request.firsturl'}=$requrl;
                 return FORBIDDEN;
+            } else {
+                return OK;
             }
-            return OK;
         }
 # ---------------------------------------------------------------- Check access
 	my $now = time;
@@ -920,8 +820,7 @@ sub handler {
                         }
                     }
                 }
-                my $clientip = &Apache::lonnet::get_requestor_ip($r);
-                $access=&Apache::lonnet::allowed('bre',$requrl,'','',$clientip,'','',$nodeeplinkcheck);
+                $access=&Apache::lonnet::allowed('bre',$requrl,'','','','','',$nodeeplinkcheck);
             }
         }
         if ($check_block) {
@@ -934,7 +833,7 @@ sub handler {
                 &Apache::blockedaccess::setup_handler($r);
                 return OK;
             }
-        } elsif ($check_access) { 
+        } elsif ($check_access) {
             if ($handle eq '') {
                 unless ($access eq 'F') {
                     if ($requrl =~ m{^/res/$match_domain/$match_username/}) {
@@ -1134,8 +1033,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]);
                         }
 		    }
 		}
@@ -1188,7 +1087,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;