--- loncom/auth/lonlogin.pm	2018/12/05 03:29:05	1.176
+++ loncom/auth/lonlogin.pm	2019/01/27 16:02:43	1.179
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.176 2018/12/05 03:29:05 raeburn Exp $
+# $Id: lonlogin.pm,v 1.179 2019/01/27 16:02:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,7 +47,7 @@ sub handler {
 	(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},
 	      $ENV{'REDIRECT_QUERY_STRING'}),
 	 ['interface','username','domain','firsturl','localpath','localres',
-	  'token','role','symb','iptoken','btoken']);
+	  'token','role','symb','iptoken','btoken','ltoken','linkkey']);
     if (!defined($env{'form.firsturl'})) {
         &Apache::lonacc::get_posted_cgi($r,['firsturl']);
     }
@@ -56,6 +56,10 @@ sub handler {
             $env{'form.firsturl'} = $ENV{'REDIRECT_URL'};
         }
     }
+    if (($env{'form.firsturl'} =~ m{^/+tiny/+$LONCAPA::match_domain/+\w+$}) &&
+        (!$env{'form.ltoken'}) && (!$env{'form.linkkey'})) {
+        &Apache::lonacc::get_posted_cgi($r,['linkkey']);
+    }
 
 # -- check if they are a migrating user
     if (defined($env{'form.token'})) {
@@ -124,6 +128,17 @@ sub handler {
             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'});
+            }
             my $balancer_token = &Apache::lonnet::tmpput(\%info,$found_server);
             if ($balancer_token) {
                 $dest .=  (($dest=~/\?/)?'&;':'?') . 'btoken='.$balancer_token;
@@ -143,10 +158,17 @@ sub handler {
 # it a balancer cookie for an active session on this server.
 #
 
-    my $balcookie;
+    my ($balcookie,$linkprot,$linkkey);
     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'});
     }
@@ -179,6 +201,62 @@ sub handler {
         if ($env{'form.firsturl'} ne '') {
             $dest = $env{'form.firsturl'};
         }
+        if (($env{'form.ltoken'}) || ($linkprot)) {
+            unless ($linkprot) {
+                my %info = &Apache::lonnet::tmpget($env{'form.ltoken'});
+                $linkprot = $info{'linkprot'};
+                my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'});
+                delete($env{'form.ltoken'});
+            }
+            if ($linkprot) {
+                my ($linkprotector,$deeplink) = split(/:/,$linkprot,2);
+                if ($env{'user.linkprotector'}) {
+                    my @protectors = split(/,/,$env{'user.linkprotector'});
+                    unless (grep(/^\Q$linkprotector\E$/,@protectors)) {
+                        push(@protectors,$linkprotector);
+                        @protectors = sort { $a <=> $b } @protectors;
+                        &Apache::lonnet::appenv({'user.linkprotector' => join(',',@protectors)});
+                    }
+                } else {
+                    &Apache::lonnet::appenv({'user.linkprotector' => $linkprotector });
+                }
+                if ($env{'user.linkproturi'}) {
+                    my @proturis = split(/,/,$env{'user.linkproturi'});
+                    unless (grep(/^\Q$deeplink\E$/,@proturis)) {
+                        push(@proturis,$deeplink);
+                        @proturis = sort @proturis;
+                        &Apache::lonnet::appenv({'user.linkproturi' => join(',',@proturis)});
+                    }
+                } else {
+                    &Apache::lonnet::appenv({'user.linkproturi' => $deeplink});
+                }
+            }
+        } elsif (($env{'form.linkkey'}) || ($linkkey)) {
+            if ($env{'form.firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
+                if ($linkkey eq '') {
+                    $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))});  
+                    }
+                } else {
+                    &Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey});
+                }
+                my $deeplink = $env{'form.firsturl'}; 
+                if ($env{'user.keyedlinkuri'}) {
+                    my @keyeduris = split(/,/,$env{'user.keyedlinkuri'});
+                    unless (grep(/^\Q$deeplink\E$/,@keyeduris)) {
+                        push(@keyeduris,$deeplink);
+                        &Apache::lonnet::appenv({'user.keyedlinkuri' => join(',',sort(@keyeduris))});
+                    }
+                } else {
+                    &Apache::lonnet::appenv({'user.keyedlinkuri' => $deeplink});
+                }
+            }
+        }
 	$r->print(
                   $start_page
                  .'<p class="LC_warning">'.&mt('You are already logged in!').'</p>'
@@ -219,7 +297,7 @@ sub handler {
     my $defdom = $domain;
     if ($lonhost ne '') {
         unless ($sessiondata{'sessionserver'}) {
-            my $redirect = &check_loginvia($domain,$lonhost,$lonidsdir,$balcookie);
+            my $redirect = &check_loginvia($domain,$lonhost,$lonidsdir,$balcookie,$linkprot);
             if ($redirect) {
                 $r->print($redirect);
                 return OK;
@@ -319,6 +397,22 @@ sub handler {
         }
         $tokenextras .= '&iptoken='.&escape($env{'form.iptoken'});
     }
+    if ($env{'form.ltoken'}) {
+        my %info = &Apache::lonnet::tmpget($env{'form.ltoken'});
+        &Apache::lonnet::tmpdel($env{'form.ltoken'});
+        delete($env{'form.ltoken'});
+        if ($info{'linkprot'}) {
+            if (!$tokenextras) {
+                $tokenextras = '&&&';
+            }
+            $tokenextras .= '&linkprot='.&escape($info{'linkprot'});
+        }
+    } elsif ($env{'form.linkkey'}) {
+        if (!$tokenextras) {
+            $tokenextras = '&&&';
+        }
+        $tokenextras .= '&linkkey='.&escape($env{'form.linkkey'});
+    }
     my $logtoken=Apache::lonnet::reply(
        'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras,
        $lonhost);
@@ -727,7 +821,7 @@ ENDDOCUMENT
 }
 
 sub check_loginvia {
-    my ($domain,$lonhost,$lonidsdir,$balcookie) = @_;
+    my ($domain,$lonhost,$lonidsdir,$balcookie,$linkprot) = @_;
     if ($domain eq '' || $lonhost eq '' || $lonidsdir eq '') {
         return;
     }
@@ -787,7 +881,7 @@ sub check_loginvia {
                             }
                         }
                     }
-                    $output = &redirect_page($newhost,$path);
+                    $output = &redirect_page($newhost,$path,$linkprot);
                 }
             }
         }
@@ -796,16 +890,23 @@ sub check_loginvia {
 }
 
 sub redirect_page {
-    my ($desthost,$path) = @_;
+    my ($desthost,$path,$linkprot) = @_;
+    my $hostname = &Apache::lonnet::hostname($desthost);
     my $protocol = $Apache::lonnet::protocol{$desthost};
     $protocol = 'http' if ($protocol ne 'https');
     unless ($path =~ m{^/}) {
         $path = '/'.$path;
     }
-    my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).$path;
+    my $url = $protocol.'://'.$hostname.$path;
     if ($env{'form.firsturl'} ne '') {
         $url .='?firsturl='.$env{'form.firsturl'};
     }
+    if ($linkprot) {
+        my $ltoken = &Apache::lonnet::tmpput({linkprot => $linkprot},$desthost);
+        if ($ltoken) {
+            $url .= (($url =~ /\?/) ? '&' : '?').'ltoken='.$ltoken;
+        }
+    }
     my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,
                                                     {'redirect' => [0,$url],});
     my $end_page   = &Apache::loncommon::end_page();