--- loncom/auth/lonauth.pm	2018/11/10 10:53:01	1.155
+++ loncom/auth/lonauth.pm	2021/05/04 18:47:37	1.163
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.155 2018/11/10 10:53:01 raeburn Exp $
+# $Id: lonauth.pm,v 1.163 2021/05/04 18:47:37 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,7 +46,7 @@ use Digest::MD5;
 # ------------------------------------------------------------ Successful login
 sub success {
     my ($r, $username, $domain, $authhost, $lowerurl, $extra_env,
-	$form,$skipcritical) = @_;
+	$form,$skipcritical,$cid) = @_;
 
 # ------------------------------------------------------------ Get cookie ready
     my $cookie =
@@ -60,8 +60,9 @@ sub success {
 
 # -------------------------------------------------------------------- Log this
 
+    my $ip = &Apache::lonnet::get_requestor_ip();
     &Apache::lonnet::log($domain,$username,$authhost,
-                         "Login $ENV{'REMOTE_ADDR'}");
+                         "Login $ip");
 
 # ------------------------------------------------- Check for critical messages
 
@@ -108,6 +109,7 @@ sub success {
             }
             $r->send_http_header;
             if (ref($form) eq 'HASH') {
+                $form->{'lti.login'} = $env{'request.lti.login'};
                 $form->{'lti.reqcrs'} = $env{'request.lti.reqcrs'};
                 $form->{'lti.reqrole'} = $env{'request.lti.reqrole'};
                 $form->{'lti.sourcecrs'} = $env{'request.lti.sourcecrs'};
@@ -147,16 +149,26 @@ sub success {
     }
     if (defined($form->{symb})) {
         my $destsymb = $form->{symb};
+        my $encrypted;
+        if ($destsymb =~ m{^/enc/}) {
+            $encrypted = 1;
+            if ($cid) {
+                $destsymb = &Apache::lonenc::unencrypted($destsymb,$cid);
+            }
+        }
         $destination  .= ($destination =~ /\?/) ? '&' : '?';
         if ($destsymb =~ /___/) {
-            # FIXME Need to deal with encrypted symbs and urls as needed.
             my ($map,$resid,$desturl)=split(/___/,$destsymb);
             $desturl = &Apache::lonnet::clutter($desturl);
+            if ($encrypted) {
+                $desturl = &Apache::lonenc::encrypted($desturl,1,$cid);
+                $destsymb = $form->{symb};
+            }
             $desturl = &HTML::Entities::encode($desturl,'"<>&');
             $destsymb = &HTML::Entities::encode($destsymb,'"<>&');
             $destination .= 'destinationurl='.$desturl.
                             '&destsymb='.$destsymb;
-        } else {
+        } elsif (!$encrypted) {
             $destsymb = &HTML::Entities::encode($destsymb,'"<>&');
             $destination .= 'destinationurl='.$destsymb;
         }
@@ -302,6 +314,20 @@ sub failed {
         my $firsturl = &Apache::loncommon::cleanup_html($form->{firsturl});
         if ($firsturl ne '') {
             $retry .= (($retry=~/\?/)?'&amp;':'?').'firsturl='.$firsturl;
+            if ($firsturl =~ m{^/tiny/$match_domain/\w+$}) {
+                unless (exists($form->{linkprot})) {
+                    if (exists($form->{linkkey})) {
+                        $retry .= 'linkkey='.$form->{linkkey};
+                    }
+                }
+            }
+        }
+    }
+    if (exists($form->{linkprot})) {
+        my $ltoken = &Apache::lonnet::tmpput({linkprot => $form->{'linkprot'}},
+                                             $r->dir_config('lonHostID'));
+        if ($ltoken) {
+            $retry .= (($retry =~ /\?/) ? '&' : '?').'ltoken='.$ltoken;
         }
     }
     my $end_page = &Apache::loncommon::end_page();
@@ -367,6 +393,9 @@ sub handler {
             my $dest = '/adm/roles';
             if ($env{'form.firsturl'} ne '') {
                 $dest = $env{'form.firsturl'};
+                if ($env{'form.firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
+                    &Apache::lonnet::appenv({'request.deeplink.login' => $env{'form.firsturl'}}); 
+                }
             }
             $r->print(
                $start_page
@@ -438,7 +467,7 @@ sub handler {
         return OK;
     }
 
-    my ($key,$firsturl,$rolestr,$symbstr,$iptokenstr)=split(/&/,$tmpinfo);
+    my ($key,$firsturl,$rolestr,$symbstr,$iptokenstr,$linkstr)=split(/&/,$tmpinfo);
     if ($rolestr) {
         $rolestr = &unescape($rolestr);
     }
@@ -448,6 +477,9 @@ sub handler {
     if ($iptokenstr) {
         $iptokenstr = &unescape($iptokenstr);
     }
+    if ($linkstr) {
+        $linkstr = &unescape($linkstr);
+    }
     if ($firsturl =~ m{^/tiny/$match_domain/\w+$}) {
         $form{'firsturl'} = $firsturl;
     }
@@ -460,6 +492,11 @@ sub handler {
     if ($iptokenstr =~ /^iptoken=/) {
         (undef,$form{'iptoken'}) = split('=',$iptokenstr);
     }
+    if ($linkstr =~ /^linkprot=/) {
+        (undef,$form{'linkprot'}) = split('=',$linkstr);
+    } elsif ($linkstr =~ /^linkkey=/) {
+        (undef,$form{'linkkey'}) = split('=',$linkstr);
+    }
 
     my $upass = $ENV{HTTPS} ? $form{'upass0'} 
         : &Apache::loncommon::des_decrypt($key,$form{'upass0'});
@@ -610,11 +647,16 @@ sub handler {
         ($is_balancer,$otherserver) =
             &Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'},'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$env{'user.domain'}\E_\Q$env{'user.name'}\E_/)) {
+                $otherserver = $found_server;
+            }
             if ($otherserver eq '') {
                 my $lowest_load;
                 ($otherserver,undef,undef,undef,$lowest_load) = &Apache::lonnet::choose_server($form{'udom'});
                 if ($lowest_load > 100) {
-                    $otherserver = &Apache::lonnet::spareserver($lowest_load,$lowest_load,1,$form{'udom'});
+                    $otherserver = &Apache::lonnet::spareserver($r,$lowest_load,$lowest_load,1,$form{'udom'});
                 }
             }
             if ($otherserver ne '') {
@@ -632,7 +674,7 @@ sub handler {
                      \%form);
             my $switchto = '/adm/switchserver?otherserver='.$otherserver;
             if (($firsturl) && ($firsturl ne '/adm/switchserver') && ($firsturl ne '/adm/roles')) {
-                $switchto .= '&origurl='.$firsturl;
+                $switchto .= '&origurl='.$firsturl; #should escape
             }
             if ($form{'role'}) {
                 $switchto .= '&role='.$form{'role'};
@@ -640,8 +682,18 @@ sub handler {
             if ($form{'symb'}) {
                 $switchto .= '&symb='.$form{'symb'};
             }
+            if ($form{'linkprot'}) {
+                $env{'request.linkprot'} = $form{'linkprot'};
+            } elsif ($form{'firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
+                if ($form{'linkkey'}) {
+                    $env{'request.linkkey'} = $form{'linkkey'};
+                }
+                $env{'request.deeplink.login'} = $form{'firsturl'};
+            }
             $r->internal_redirect($switchto);
         } else {
+            &Apache::loncommon::content_type($r,'text/html');
+            $r->send_http_header;
             $r->print(&noswitch());
         }
         return OK;
@@ -653,7 +705,7 @@ sub handler {
                          \%form);
                 my $switchto = '/adm/switchserver?otherserver='.$otherserver;
                 if (($firsturl) && ($firsturl ne '/adm/switchserver') && ($firsturl ne '/adm/roles')) {
-                    $switchto .= '&origurl='.$firsturl;
+                    $switchto .= '&origurl='.$firsturl; #should escape
                 }
                 if ($form{'role'}) {
                     $switchto .= '&role='.$form{'role'};
@@ -661,8 +713,19 @@ sub handler {
                 if ($form{'symb'}) {
                     $switchto .= '&symb='.$form{'symb'};
                 }
+                if ($form{'linkprot'}) {
+                    $env{'request.linkprot'} = $form{'linkprot'};
+                } elsif ($form{'firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
+                    if ($form{'linkkey'}) {
+                        $env{'request.linkkey'} = $form{'linkkey'};
+                    }
+                    $env{'request.deeplink.login'} = $form{'firsturl'};
+
+                }
                 $r->internal_redirect($switchto);
             } else {
+                &Apache::loncommon::content_type($r,'text/html');
+                $r->send_http_header;
                 $r->print(&noswitch());
             }
             return OK;
@@ -683,13 +746,21 @@ sub handler {
 
 # ---------------------------------------------------------- Are we overloaded?
         if ((($userloadpercent>100.0)||($loadpercent>100.0))) {
-            my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent,1,$form{'udom'});
+            my $unloaded=Apache::lonnet::spareserver($r,$loadpercent,$userloadpercent,1,$form{'udom'});
             if (!$unloaded) {
                 ($unloaded) = &Apache::lonnet::choose_server($form{'udom'});
             }
             if ($unloaded) {
                 &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',
                          undef,\%form);
+                if ($form{'linkprot'}) {
+                    $env{'request.linkprot'} = $form{'linkprot'};
+                } elsif ($form{'firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
+                    if ($form{'linkkey'}) {
+                        $env{'request.linkkey'} = $form{'linkkey'};
+                    }
+                    $env{'request.deeplink.login'} = $form{'firsturl'};
+                }
                 $r->internal_redirect('/adm/switchserver?otherserver='.$unloaded.'&origurl='.$firsturl);
                 return OK;
             }
@@ -697,7 +768,23 @@ sub handler {
         if (($is_balancer) && ($hosthere)) {
             $form{'noloadbalance'} = $hosthere;
         }
-        &success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,undef,
+        my $extra_env;
+        if ($form{'linkprot'}) {
+            my ($linkprotector,$uri) = split(/:/,$form{'linkprot'},2);
+            if ($linkprotector) {
+                $extra_env = {'user.linkprotector' => $linkprotector,
+                              'user.linkproturi'   => $uri,};
+            }
+        } elsif ($form{'firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
+            if ($form{'linkkey'}) {
+                $extra_env = {'user.deeplinkkey' => $form{'linkkey'},
+                              'user.keyedlinkuri' => $form{'firsturl'},
+                              'request.deeplink.login' => $form{'firsturl'}};
+            } else {
+                $extra_env = {'request.deeplink.login' => $form{'firsturl'}};
+            }
+        }
+        &success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,$extra_env,
                  \%form);
         return OK;
     }
@@ -743,7 +830,10 @@ sub check_can_host {
             if ($login_host ne '') {
                 my $protocol = $Apache::lonnet::protocol{$login_host};
                 $protocol = 'http' if ($protocol ne 'https');
+                my $alias = &Apache::lonnet::use_proxy_alias($r,$login_host);
+                $hostname = $alias if ($alias ne '');
                 my $newurl = $protocol.'://'.$hostname.'/adm/createaccount';
+#FIXME Should preserve where user was going and linkprot by setting ltoken at $login_host
                 $r->print(&Apache::loncommon::start_page('Create a user account in LON-CAPA').
                           '<h3>'.&mt('Account creation').'</h3>'.
                           &mt('You do not currently have a LON-CAPA account at this institution.').'<br />'.
@@ -760,6 +850,14 @@ sub check_can_host {
         } else {
             &success($r,$form->{'uname'},$udom,$authhost,'noredirect',undef,
                      $form);
+            if ($form->{'linkprot'}) {
+                $env{'request.linkprot'} = $form->{'linkprot'};
+            } elsif ($form->{'firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
+                if ($form->{'linkkey'}) {
+                    $env{'request.linkkey'} = $form->{'linkkey'};
+                }
+                $env{'request.deeplink.login'} = $form->{'firsturl'};
+            }
             my ($otherserver) = &Apache::lonnet::choose_server($udom);
             $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver);
         }