--- loncom/auth/lonlogin.pm	2021/10/26 15:52:54	1.192
+++ loncom/auth/lonlogin.pm	2021/11/03 01:04:02	1.193
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.192 2021/10/26 15:52:54 raeburn Exp $
+# $Id: lonlogin.pm,v 1.193 2021/11/03 01:04:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -49,11 +49,29 @@ sub handler {
 	(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},
 	      $ENV{'REDIRECT_QUERY_STRING'}),
 	 ['interface','username','domain','firsturl','localpath','localres',
-	  'token','role','symb','iptoken','btoken','ltoken','linkkey','saml',
-          'sso','retry']);
+	  'token','role','symb','iptoken','btoken','ltoken','ttoken','linkkey',
+          'saml','sso','retry']); 
+
+# -- check if they are a migrating user
+    if (defined($env{'form.token'})) {
+        return &Apache::migrateuser::handler($r);
+    }
+
     my $lonhost = $r->dir_config('lonHostID');
-    my $linkkey;
-    if (($env{'form.sso'}) || ($env{'form.retry'})) {
+    if ($env{'form.ttoken'}) {
+        my %info = &Apache::lonnet::tmpget($env{'form.ttoken'});
+        &Apache::lonnet::tmpdel($env{'form.ttoken'});
+        if ($info{'origurl'}) {
+            $env{'form.firsturl'} = $info{'origurl'};
+        }
+        if ($info{'ltoken'}) {
+            $env{'form.ltoken'} = $info{'ltoken'};
+        } elsif ($info{'linkprot'}) {
+            $env{'form.linkprot'} = $info{'linkprot'};
+        } elsif ($info{'linkkey'} ne '') {
+            $env{'form.linkkey'} = $info{'linkkey'};
+        }
+    } elsif (($env{'form.sso'}) || ($env{'form.retry'})) {
         my $infotoken;
         if ($env{'form.sso'}) {
             $infotoken = $env{'form.sso'};
@@ -70,9 +88,6 @@ sub handler {
             &Apache::lonnet::tmpdel($infotoken);
         }
     } else {
-        if ($env{'form.linkkey'}) {
-            $linkkey = $env{'form.linkkey'};
-        }        
         if (!defined($env{'form.firsturl'})) {
             &Apache::lonacc::get_posted_cgi($r,['firsturl']);
         }
@@ -82,7 +97,7 @@ sub handler {
             }
         }
         if (($env{'form.firsturl'} =~ m{^/+tiny/+$LONCAPA::match_domain/+\w+$}) &&
-            (!$env{'form.ltoken'}) && (!$env{'form.linkkey'})) {
+            (!$env{'form.ltoken'}) && (!$env{'form.linkprot'}) && (!$env{'form.linkkey'})) {
             &Apache::lonacc::get_posted_cgi($r,['linkkey']);
         }
         if ($env{'form.firsturl'} eq '/adm/logout') {
@@ -90,11 +105,6 @@ sub handler {
         }
     }
 
-# -- check if they are a migrating user
-    if (defined($env{'form.token'})) {
-	return &Apache::migrateuser::handler($r);
-    }
-
 # For "public user" - remove any exising "public" cookie, as user really wants to log-in
     my ($handle,$lonidsdir,$expirepub,$userdom);
     $lonidsdir=$r->dir_config('lonIDsDir');
@@ -149,31 +159,40 @@ sub handler {
             $protocol = 'http' if ($protocol ne 'https');
             my $dest = '/adm/roles';
             if ($env{'form.firsturl'} ne '') {
-                if ($env{'form.firsturl'} =~ /[^\x00-\xFF]/) {
-                    $dest = &uri_escape_utf8($env{'form.firsturl'});
-                } else {
-                    $dest = &uri_escape($env{'form.firsturl'});
-                }
-                $dest = &HTML::Entities::encode($dest,"'");
+                $dest = &HTML::Entities::encode($env{'form.firsturl'},'\'"<>&');
             }
             my %info = (
                          balcookie => $lonhost.':'.$balancer_cookie,
                        );
-            if ($env{'form.ltoken'}) {
-                my %link_info = &Apache::lonnet::tmpget($env{'form.ltoken'});
-                if ($link_info{'linkprot'}) {
-                    $info{'linkprot'} = $link_info{'linkprot'};
-                }
-                &Apache::lonnet::tmpdel($env{'form.ltoken'});
-                delete($env{'form.ltoken'});
-            } elsif ($env{'form.linkkey'}) {
-                $info{'linkkey'} = $env{'form.linkkey'};
-                delete($env{'form.linkkey'});
+            if ($env{'form.role'}) {
+                $info{'role'} = $env{'form.role'};
+            }
+            if ($env{'form.symb'}) {
+                $info{'symb'} = $env{'form.symb'};
             }
             my $balancer_token = &Apache::lonnet::tmpput(\%info,$found_server);
-            if ($balancer_token) {
+            unless (($balancer_token eq 'con_lost') || ($balancer_token eq 'refused') ||
+                    ($balancer_token eq 'unknown_cmd') || ($balancer_token eq 'no_such_host')) {
                 $dest .=  (($dest=~/\?/)?'&amp;':'?') . 'btoken='.$balancer_token;
             }
+            if ($env{'form.firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
+                my %link_info;
+                if ($env{'form.ltoken'}) {
+                    $link_info{'ltoken'} = $env{'form.ltoken'};
+                } elsif ($env{'form.linkprot'}) {
+                    $link_info{'linkprot'} = $env{'form.linkprot'};
+                } elsif ($env{'form.linkkey'} ne '') {
+                    $link_info{'linkkey'} = $env{'form.linkkey'};
+                }
+                if (keys(%link_info)) {
+                    $link_info{'origurl'} = $env{'form.firsturl'};
+                    my $token = &Apache::lonnet::tmpput(\%link_info,$found_server,'link');
+                    unless (($token eq 'con_lost') || ($token eq 'refused') ||
+                            ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) {
+                        $dest .=  (($dest=~/\?/)?'&amp;':'?') . 'ttoken='.$token;
+                    }
+                }
+            }
             unless ($found_server eq $lonhost) {
                 my $alias = &Apache::lonnet::use_proxy_alias($r,$found_server);
                 $hostname = $alias if ($alias ne '');
@@ -193,17 +212,10 @@ sub handler {
 # it a balancer cookie for an active session on this server.
 #
 
-    my ($balcookie,$linkprot,$linkkey);
+    my $balcookie;
     if ($env{'form.btoken'}) {
         my %info = &Apache::lonnet::tmpget($env{'form.btoken'});
         $balcookie = $info{'balcookie'};
-        if ($balcookie) {
-            if ($info{'linkprot'}) {
-                $linkprot = $info{'linkprot'};
-            } elsif ($info{'linkkey'}) {
-                $linkkey = $info{'linkkey'};
-            }
-        }    
         &Apache::lonnet::tmpdel($env{'form.btoken'});
         delete($env{'form.btoken'});
     }
@@ -234,19 +246,16 @@ sub handler {
 	    &Apache::loncommon::end_page();
         my $dest = '/adm/roles';
         if ($env{'form.firsturl'} ne '') {
-            if ($env{'form.firsturl'} =~ /[^\x00-\xFF]/) {
-                $dest = &uri_escape_utf8($env{'form.firsturl'});
-            } else {
-                $dest = &uri_escape($env{'form.firsturl'});
-            }
-            $dest = &HTML::Entities::encode($dest,"'");
+            $dest = &HTML::Entities::encode($env{'form.firsturl'},'\'"<>&');
         }
-        if (($env{'form.ltoken'}) || ($linkprot)) {
-            unless ($linkprot) {
+        if (($env{'form.ltoken'}) || ($env{'form.linkprot'})) {
+            my $linkprot;
+            if ($env{'form.ltoken'}) {
                 my %info = &Apache::lonnet::tmpget($env{'form.ltoken'});
                 $linkprot = $info{'linkprot'};
                 my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'});
-                delete($env{'form.ltoken'});
+            } else {
+                $linkprot = $env{'form.linkprot'};
             }
             if ($linkprot) {
                 my ($linkprotector,$deeplink) = split(/:/,$linkprot,2);
@@ -271,16 +280,14 @@ sub handler {
                     &Apache::lonnet::appenv({'user.linkproturi' => $deeplink});
                 }
             }
-        } elsif (($env{'form.linkkey'}) || ($linkkey)) {
+        } elsif ($env{'form.linkkey'} ne '') {
             if ($env{'form.firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
-                if ($linkkey eq '') {
-                    $linkkey = $env{'form.linkkey'};
-                }
+                my $linkkey = $env{'form.linkkey'};
                 if ($env{'user.deeplinkkey'}) {
                     my @linkkeys = split(/,/,$env{'user.deeplinkkey'});
                     unless (grep(/^\Q$linkkey\E$/,@linkkeys)) {
                         push(@linkkeys,$linkkey);
-                        &Apache::lonnet::appenv({'user.deeplinkkey' => join(',',sort(@linkkeys))});  
+                        &Apache::lonnet::appenv({'user.deeplinkkey' => join(',',sort(@linkkeys))});
                     }
                 } else {
                     &Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey});
@@ -337,8 +344,7 @@ sub handler {
     my $defdom = $domain;
     if ($lonhost ne '') {
         unless ($sessiondata{'sessionserver'}) {
-            my $redirect = &check_loginvia($domain,$lonhost,$lonidsdir,$balcookie,
-                                           $linkprot,$linkkey);
+            my $redirect = &check_loginvia($domain,$lonhost,$lonidsdir,$balcookie);
             if ($redirect) {
                 $r->print($redirect);
                 return OK;
@@ -423,11 +429,11 @@ sub handler {
 
 # -------------------------------------------------------- Store away log token
     my ($tokenextras,$tokentype);
-    my @names = ('role','symb','iptoken','ltoken','linkkey');
+    my @names = ('role','symb','iptoken','ltoken','linkprot','linkkey');
     foreach my $name (@names) {
         if ($env{'form.'.$name} ne '') {
             if ($name eq 'ltoken') {
-                my %info = &Apache::lonnet::tmpget($env{'form.ltoken'});
+                my %info = &Apache::lonnet::tmpget($env{'form.'.$name});
                 if ($info{'linkprot'}) {
                     $tokenextras .= '&linkprot='.&escape($info{'linkprot'});
                     $tokentype = 'link';
@@ -435,7 +441,7 @@ sub handler {
                 }
             } else {
                 $tokenextras .= '&'.$name.'='.&escape($env{'form.'.$name});
-                if ($name eq 'linkkey') {
+                if (($name eq 'linkkey') || ($name eq 'linkprot')) {
                     $tokentype = 'link';
                 }
             }
@@ -445,7 +451,7 @@ sub handler {
         $tokenextras .= ":$tokentype";
     }
     my $logtoken=Apache::lonnet::reply(
-       'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras,
+       'tmpput:'.$ukey.$lkey.'&'.&escape($firsturl).$tokenextras,
        $lonhost);
 
 # -- If we cannot talk to ourselves, or hostID does not map to a hostname
@@ -1000,7 +1006,7 @@ ENDDOCUMENT
 }
 
 sub check_loginvia {
-    my ($domain,$lonhost,$lonidsdir,$balcookie,$linkprot,$linkkey) = @_;
+    my ($domain,$lonhost,$lonidsdir,$balcookie) = @_;
     if ($domain eq '' || $lonhost eq '' || $lonidsdir eq '') {
         return;
     }
@@ -1060,7 +1066,7 @@ sub check_loginvia {
                             }
                         }
                     }
-                    $output = &redirect_page($newhost,$path,$linkprot,$linkkey);
+                    $output = &redirect_page($newhost,$path);
                 }
             }
         }
@@ -1069,7 +1075,7 @@ sub check_loginvia {
 }
 
 sub redirect_page {
-    my ($desthost,$path,$linkprot,$linkkey) = @_;
+    my ($desthost,$path) = @_;
     my $hostname = &Apache::lonnet::hostname($desthost);
     my $protocol = $Apache::lonnet::protocol{$desthost};
     $protocol = 'http' if ($protocol ne 'https');
@@ -1087,13 +1093,18 @@ sub redirect_page {
         $querystring = &HTML::Entities::encode($querystring,"'");
         $url .='?firsturl='.$querystring;
     }
-    if ($linkprot) {
-        my $ltoken = &Apache::lonnet::tmpput({linkprot => $linkprot},$desthost);
-        if ($ltoken) {
-            $url .= (($url =~ /\?/) ? '&amp;' : '?').'ltoken='.$ltoken;
+    if (($env{'form.ltoken'}) || ($env{'form.linkkey'} ne '')) {
+        my %link_info;
+        if ($env{'form.ltoken'}) {
+            $link_info{'ltoken'} = $env{'form.ltoken'};
+        } elsif ($env{'form.linkkey'} ne '') {
+            $link_info{'linkkey'} = $env{'form.linkkey'};
+        }
+        my $token = &Apache::lonnet::tmpput(\%link_info,$desthost,'link');
+        unless (($token eq 'con_lost') || ($token eq 'refused') ||
+                ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) {
+            $url .= (($url=~/\?/)?'&amp;':'?') . 'ttoken='.$token;
         }
-    } elsif ($linkkey) {
-        $url .= (($url =~ /\?/) ? '&amp;' : '?').'linkkey='.&uri_escape($linkkey);        
     }
     my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,
                                                     {'redirect' => [0,$url],});