--- loncom/auth/lonacc.pm	2021/12/12 00:53:57	1.159.2.21
+++ loncom/auth/lonacc.pm	2021/10/26 14:17:21	1.198
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.159.2.21 2021/12/12 00:53:57 raeburn Exp $
+# $Id: lonacc.pm,v 1.198 2021/10/26 14:17:21 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);
 
@@ -159,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') {
@@ -203,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 {
@@ -297,7 +305,7 @@ sub sso_login {
     my $query = $r->args;
     my %form;
     if ($query) {
-        my @items = ('role','symb','iptoken','origurl','logtoken');
+        my @items = ('role','symb','iptoken','origurl','ltoken','linkkey');
         &Apache::loncommon::get_unprocessed_cgi($query,\@items);
         foreach my $item (@items) {
             if (defined($env{'form.'.$item})) {
@@ -315,36 +323,14 @@ sub sso_login {
         }
     }
 
-#
-# If Shibboleth auth is in use, and a dual SSO and non-SSO login page
-# is in use, then the query string will contain the logtoken item with
-# a value set to the name of a .tmp file in /home/httpd/perl/tmp
-# containing the url to display after authentication, and also,
-# optionally, role and symb.
-#
-# Otherwise the query string may contain role and symb.
-#
-
-    if ($form{'logtoken'}) {
-        my ($firsturl,@rest);
-        my $lonhost = $r->dir_config('lonHostID');
-        my $tmpinfo = &Apache::lonnet::reply('tmpget:'.$form{'logtoken'},$lonhost);
-        my $delete = &Apache::lonnet::tmpdel($form{'logtoken'});
-        unless (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost') ||
-                ($tmpinfo eq 'no_such_host')) {
-            (undef,$firsturl,@rest) = split(/&/,$tmpinfo);
-            if ($firsturl ne '') {
-                $firsturl = &unescape($firsturl);
-            }
-            foreach my $item (@rest) {
-                my ($key,$value) = split(/=/,$item);
-                $form{$key} = &unescape($value);
-            }
-            if ($form{'iptoken'}) {
-                %sessiondata = &Apache::lonnet::tmpget($form{'iptoken'});
-                my $delete = &Apache::lonnet::tmpdel($form{'iptoken'});
-            }
-        }
+    my ($linkprot,$linkkey);
+    if ($form{'ltoken'}) {
+        my %link_info = &Apache::lonnet::tmpget($form{'ltoken'});
+        $linkprot = $link_info{'linkprot'};
+        my $delete = &Apache::lonnet::tmpdel($form{'ltoken'});
+    }
+    if ($form{'linkkey'} ne '') {
+        $linkkey = $form{'linkkey'};
     }
 
     my $domain = $r->dir_config('lonSSOUserDomain');
@@ -396,6 +382,18 @@ sub sso_login {
                     $env{'form.origurl'} = $r->uri;
                 }
             }
+            if (($r->uri eq '/adm/sso') && ($form{'origurl'} =~ m{^/+tiny/+$match_domain/+\w+$})) {
+                $env{'request.deeplink.login'} = $form{'origurl'};
+            } elsif ($r->uri =~ m{^/+tiny/+$match_domain/+\w+$}) {
+                $env{'request.deeplink.login'} = $r->uri;
+            }
+            if ($env{'request.deeplink.login'}) {
+                if ($linkprot) {
+                    $env{'request.linkprot'} = $linkprot;
+                } elsif ($linkkey ne '') {
+                    $env{'request.linkkey'} = $linkkey;
+                }
+            }
             $env{'request.sso.login'} = 1;
             if (defined($r->dir_config("lonSSOReloginServer"))) {
                 $env{'request.sso.reloginserver'} =
@@ -410,7 +408,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,
@@ -420,8 +418,6 @@ sub sso_login {
             foreach my $item ('role','symb','iptoken','origurl') {
                 if (exists($form{$item})) {
                     $info{$item} = $form{$item};
-                } elsif ($sessiondata{$item} ne '') {
-                    $info{$item} = $sessiondata{$item};
                 }
             }
             unless (($info{'symb'}) || ($info{'origurl'})) {
@@ -429,6 +425,18 @@ sub sso_login {
                     $info{'origurl'} = $r->uri; 
                 }
             }
+            if (($r->uri eq '/adm/sso') && ($form{'origurl'} =~ m{^/+tiny/+$match_domain/+\w+$})) {
+                $info{'deeplink.login'} = $form{'origurl'};
+            } elsif ($r->uri =~ m{^/+tiny/+$match_domain/+\w+$}) {
+                $info{'deeplink.login'} = $r->uri;
+            }
+            if ($info{'deeplink.login'}) {
+                if ($linkprot) {
+                    $info{'linkprot'} = $linkprot;
+                } elsif ($linkkey ne '') {
+                    $info{'linkkey'} = $linkkey;
+                }
+            }
             if ($r->dir_config("ssodirecturl") == 1) {
                 $info{'origurl'} = $r->uri;
             }
@@ -466,8 +474,6 @@ sub sso_login {
             $r->subprocess_env->set('SSOUserUnknown' => $user);
             $r->subprocess_env->set('SSOUserDomain' => $domain);
             if (grep(/^sso$/,@cancreate)) {
-#FIXME - need to preserve origurl, role and symb for use after account
-# creation
                 $r->set_handlers('PerlHandler'=> [\&Apache::createaccount::handler]);
                 $r->handler('perl-script');
             } else {
@@ -565,7 +571,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)) {
@@ -587,6 +594,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;
@@ -631,7 +639,15 @@ sub handler {
                 }
             }
         }
-
+        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;
         my ($check_symb,$check_access,$check_block,$access,$poss_symb);
@@ -643,7 +659,8 @@ sub handler {
             if (($requrl eq '/adm/viewclasslist') ||
                 ($requrl =~ m{^(/adm/wrapper|)\Q/uploaded/$cdom/$cnum/docs/\E}) ||
                 ($requrl =~ m{^/adm/.*/aboutme$}) ||
-                ($requrl=~m{^/adm/coursedocs/showdoc/})) {
+                ($requrl=~m{^/adm/coursedocs/showdoc/}) ||
+                ($requrl=~m{^(/adm/wrapper|)/adm/$cdom/$cnum/\d+/ext\.tool$})) {
                 $check_block = 1;
             }
         }
@@ -656,7 +673,8 @@ sub handler {
                 ($requrl=~m|\.problem/smpedit$|) ||
                 ($requrl=~/^\/public\/.*\/syllabus$/) ||
                 ($requrl=~/^\/adm\/(viewclasslist|navmaps)$/) ||
-                ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/)) {
+                ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/) ||
+                ($requrl=~m{^/adm/$cdom/$cnum/\d+/ext\.tool$})) {
                 $check_symb = 1;
             }
         }
@@ -689,6 +707,9 @@ sub handler {
                         if ((!$env{'request.role.adv'}) && ($env{'acc.randomout'}) &&
                             ($env{'acc.randomout'}=~/\&\Q$poss_symb\E\&/)) {
                             undef($poss_symb);
+                        } elsif ((!$env{'request.role.adv'}) && ($env{'acc.deeplinkout'}) &&
+                                 ($env{'acc.deeplinkout'}=~/\&\Q$poss_symb\E\&/)) {
+                            undef($poss_symb);
                         }
                     }
                 }
@@ -698,8 +719,18 @@ sub handler {
                     $access=&Apache::lonnet::allowed('bre',$requrl,'','','','',1);
                 }
             } else {
-                my $clientip = &Apache::lonnet::get_requestor_ip($r);
-                $access=&Apache::lonnet::allowed('bre',$requrl,'','',$clientip);
+                my $nodeeplinkcheck;
+                if (($check_access) && ($requrl =~ /\.(sequence|page)$/)) {
+                    unless ($env{'form.navmap'}) {
+                        if ($r->args ne '') {
+                            &Apache::loncommon::get_unprocessed_cgi($r->args,['navmap']);
+                            unless ($env{'form.navmap'}) {
+                                $nodeeplinkcheck = 1;
+                            }
+                        }
+                    }
+                }
+                $access=&Apache::lonnet::allowed('bre',$requrl,'','','','','',$nodeeplinkcheck);
             }
         }
         if ($check_block) {
@@ -712,7 +743,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/}) {
@@ -737,6 +768,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);
@@ -908,8 +943,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]);
                         }
 		    }
 		}
@@ -962,7 +997,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;