--- loncom/auth/lonauth.pm	2019/01/27 16:02:43	1.157
+++ loncom/auth/lonauth.pm	2021/08/09 15:36:28	1.165
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.157 2019/01/27 16:02:43 raeburn Exp $
+# $Id: lonauth.pm,v 1.165 2021/08/09 15:36:28 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;
         }
@@ -381,8 +393,34 @@ 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'}}); 
+                if (($env{'form.firsturl'} =~ m{^/tiny/$match_domain/\w+$}) &&
+                    ($env{'request.course.id'})) {
+                    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                    my $symb = &Apache::loncommon::symb_from_tinyurl($env{'form.firsturl'},$cnum,$cdom);
+                    if ($symb) {
+                        my $buffer;
+                        if ($r->header_in('Content-length') > 0) {
+                            $r->read($buffer,$r->header_in('Content-length'),0);
+                        }
+                        my %form;
+                        foreach my $pair (split(/&/,$buffer)) {
+                            my ($name,$value) = split(/=/,$pair);
+                            $value =~ tr/+/ /;
+                            $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+                            $form{$name}=$value;
+                        }
+                        &set_deeplink_login(%form);
+                    } else {
+                        $r->print(
+                                  $start_page
+                                 .'<p class="LC_warning">'.&mt('You are already logged in!').'</p>'
+                                 .'<p>'.&mt('Please [_1]log out[_2] first, and then try your access again',
+                                            '<a href="/adm/logout">','</a>')
+                                 .'</p>'
+                                 .$end_page);
+                        return OK;
+                    }
                 }
             }
             $r->print(
@@ -635,11 +673,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 '') {
@@ -667,14 +710,16 @@ sub handler {
             }
             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'};
+            } elsif ($form{'linkkey'}) {
+                $env{'request.linkkey'} = $form{'linkkey'};
+            }
+            if ($form{'firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
+                &set_deeplink_login(%form);
             }
             $r->internal_redirect($switchto);
         } else {
+            &Apache::loncommon::content_type($r,'text/html');
+            $r->send_http_header;
             $r->print(&noswitch());
         }
         return OK;
@@ -696,15 +741,16 @@ sub handler {
                 }
                 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'};
-
+                } elsif ($form{'linkkey'}) {
+                    $env{'request.linkkey'} = $form{'linkkey'};
+                }
+                if ($form{'firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
+                    &set_deeplink_login(%form);
                 }
                 $r->internal_redirect($switchto);
             } else {
+                &Apache::loncommon::content_type($r,'text/html');
+                $r->send_http_header;
                 $r->print(&noswitch());
             }
             return OK;
@@ -725,7 +771,7 @@ 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'});
             }
@@ -734,11 +780,11 @@ sub handler {
                          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'};
+                } elsif ($form{'linkkey'}) {
+                    $env{'request.linkkey'} = $form{'linkkey'};
+                }
+                if ($form{'firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
+                    &set_deeplink_login(%form);
                 }
                 $r->internal_redirect('/adm/switchserver?otherserver='.$unloaded.'&origurl='.$firsturl);
                 return OK;
@@ -752,15 +798,20 @@ sub handler {
             my ($linkprotector,$uri) = split(/:/,$form{'linkprot'},2);
             if ($linkprotector) {
                 $extra_env = {'user.linkprotector' => $linkprotector,
-                              'user.linkproturi'   => $uri,};
+                              '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'}};
+        } elsif ($form{'linkkey'}) {
+            $extra_env = {'user.deeplinkkey' => $form{'linkkey'},
+                          'user.keyedlinkuri' => $form{'firsturl'}};
+        }
+        if ($form{'firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
+            &set_deeplink_login(%form);
+            if ($env{'request.deeplink.login'}) {
+                if (ref($extra_env) eq 'HASH') {
+                    %{$extra_env} = ( %{$extra_env}, 'request.deeplink.login' => $form{'firsturl'} );
+                } else {
+                    $extra_env = {'request.deeplink.login' => $form{'firsturl'}};
+                }
             }
         }
         &success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,$extra_env,
@@ -769,6 +820,37 @@ sub handler {
     }
 }
 
+sub set_deeplink_login {
+    my (%form) = @_;
+    if ($form{'firsturl'} =~ m{^/tiny/($match_domain)/\w+$}) {
+        my $cdom = $1;
+        my ($cnum,$symb) = &Apache::loncommon::symb_from_tinyurl($form{'firsturl'},'',$cdom);
+        if ($symb) {
+            my $disallow;
+            my $deeplink = &Apache::lonnet::EXT("resource.0.deeplink",$symb);
+            if ($deeplink ne '') {
+                my ($state,$others,$listed,$scope,$protect) = split(/,/,$deeplink);
+                if (($protect ne 'none') && ($protect ne '')) {
+                    my ($acctype,$item) = split(/:/,$protect);
+                    if (($acctype eq 'ltic') || ($acctype eq 'ltid')) {
+                         unless ($form{'linkprot'} eq $protect) {
+                             $disallow = 1;
+                         }
+                    } elsif ($acctype eq 'key') {
+                        unless ($form{'linkkey'} eq $item) {
+                            $disallow = 1;
+                        }
+                    }
+                }
+            }
+            unless ($disallow) {
+                $env{'request.deeplink.login'} = $form{'firsturl'};
+            }
+        }
+    }
+    return;
+}
+
 sub check_can_host {
     my ($r,$form,$authhost,$domdesc) = @_;
     return unless (ref($form) eq 'HASH');
@@ -809,6 +891,8 @@ 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').