--- loncom/auth/lonauth.pm	2022/08/30 12:10:43	1.121.2.24.2.5
+++ loncom/auth/lonauth.pm	2022/02/27 02:06:20	1.121.2.25
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.121.2.24.2.5 2022/08/30 12:10:43 raeburn Exp $
+# $Id: lonauth.pm,v 1.121.2.25 2022/02/27 02:06:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,7 +29,7 @@
 package Apache::lonauth;
 
 use strict;
-use LONCAPA qw(:DEFAULT :match);
+use LONCAPA;
 use Apache::Constants qw(:common);
 use CGI qw(:standard);
 use Apache::loncommon();
@@ -46,7 +46,7 @@ use CGI::Cookie();
 # ------------------------------------------------------------ Successful login
 sub success {
     my ($r, $username, $domain, $authhost, $lowerurl, $extra_env,
-	$form,$cid,$expirepub,$write_to_opener) = @_;
+	$form,$cid,$expirepub) = @_;
 
 # ------------------------------------------------------------ Get cookie ready
     my $cookie =
@@ -148,59 +148,22 @@ sub success {
         $destination .= 'source=login';
     }
 
-    my $brcrum = [{'href' => '',
-                   'text' => 'Successful Login'},];
-    my $args = {'no_inline_link' => 1,
-                'bread_crumbs' => $brcrum,};
-    if (($env{'request.deeplink.login'} eq $lowerurl) &&
-        (($env{'request.linkprot'}) || ($env{'request.linkkey'} ne ''))) {
-        my %info;
-        if ($env{'request.linkprot'}) {
-            $info{'linkprot'} = $env{'request.linkprot'};
-            foreach my $item ('linkprotuser','linkprotexit') {
-                if ($form->{$item}) {
-                    $info{$item} = $form->{$item};
-                }
-            }
-            $args = {'only_body' => 1,};
-        } elsif ($env{'request.linkkey'} ne '') {
-            $info{'linkkey'} = $env{'request.linkkey'};
-        }
-        $info{'origurl'} = $lowerurl;
-        my $token = &Apache::lonnet::tmpput(\%info,$r->dir_config('lonHostID'),'link');
-        unless (($token eq 'con_lost') || ($token eq 'refused') ||
-                ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) {
-            $destination .= (($destination =~ /\?/) ? '&' : '?') . 'ttoken='.$token;
-        }
-    }
-    if ($env{'request.deeplink.login'}) {
-        if ($env{'environment.remote'} eq 'on') {
-            &Apache::lonnet::appenv({'environment.remote' => 'off'});
-        }
-    }
-    my $startupremote;
-    if ($write_to_opener) {
-        if ($env{'environment.remote'} eq 'on') {
-            &Apache::lonnet::appenv({'environment.remote' => 'off'});
-        }
-        $args->{'redirect'} = [0,$destination,'',$write_to_opener];
-    } else {
-        $startupremote=&Apache::lonmenu::startupremote($destination);
-    }
-
     my $windowinfo=&Apache::lonmenu::open($env{'browser.os'});
+    my $startupremote=&Apache::lonmenu::startupremote($destination);
     my $remoteinfo=&Apache::lonmenu::load_remote_msg($lowerurl);
     my $setflags=&Apache::lonmenu::setflags();
     my $maincall=&Apache::lonmenu::maincall();
+    my $brcrum = [{'href' => '',
+                   'text' => 'Successful Login'},];
     my $start_page=&Apache::loncommon::start_page('Successful Login',
-                                                  $startupremote,$args);
+                                                  $startupremote,
+                                                  {'no_inline_link' => 1,
+                                                   'bread_crumbs' => $brcrum,});
     my $end_page  =&Apache::loncommon::end_page();
 
     my $continuelink;
     if ($env{'environment.remote'} eq 'off') {
-        unless ($write_to_opener) {
-	    $continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';
-        }
+	$continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';
     }
 # ------------------------------------------------- Output for successful login
 
@@ -219,24 +182,17 @@ sub success {
     }
     $r->send_http_header;
 
-    if ($env{'request.linkprot'}) {
-        $r->print(<<END);
-$start_page
-<br />$continuelink
-$end_page
-END
-    } else {
-        my %lt=&Apache::lonlocal::texthash(
-				           'wel' => 'Welcome',
-				           'pro' => 'Login problems?',
-				          );
-        my $loginhelp = &loginhelpdisplay($domain);
-        if ($loginhelp) {
-            $loginhelp = '<p><a href="'.$loginhelp.'">'.$lt{'pro'}.'</a></p>';
-        }
+    my %lt=&Apache::lonlocal::texthash(
+				       'wel' => 'Welcome',
+				       'pro' => 'Login problems?',
+				       );
+    my $loginhelp = &loginhelpdisplay($domain);
+    if ($loginhelp) {
+        $loginhelp = '<p><a href="'.$loginhelp.'">'.$lt{'pro'}.'</a></p>';
+    }
 
-        my $welcome = &mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','<i>','</i>'); 
-        $r->print(<<ENDSUCCESS);
+    my $welcome = &mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','<i>','</i>'); 
+    $r->print(<<ENDSUCCESS);
 $start_page
 $setflags
 $windowinfo
@@ -248,7 +204,6 @@ $maincall
 $continuelink
 $end_page
 ENDSUCCESS
-    }
     return;
 }
 
@@ -262,11 +217,6 @@ sub failed {
     if ($clientunicode && !$clientmathml) {
         $args = {'browser.unicode' => 1};
     }
-    if ($form->{firsturl} =~ m{^/tiny/$match_domain/\w+$}) {
-        if ($form->{linkprot}) {
-            $args->{only_body} = 1;
-        }
-    }
 
     my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,$args);
     my $uname = &Apache::loncommon::cleanup_html($form->{'uname'});
@@ -301,28 +251,6 @@ sub failed {
             my $firsturl = &Apache::loncommon::cleanup_html($form->{firsturl});
             if ($firsturl ne '') {
                 $retry .= (($retry=~/\?/)?'&amp;':'?').'firsturl='.$firsturl;
-                if ($form->{firsturl} =~ m{^/tiny/$match_domain/\w+$}) {
-                    unless (exists($form->{linkprot})) {
-                        if (exists($form->{linkkey})) {
-                            $retry .= 'linkkey='.$form->{linkkey};
-                        }
-                    }
-                }
-            }
-        }
-        if (exists($form->{linkprot})) {
-            my %info = (
-                         'linkprot' => $form->{'linkprot'},
-                       );
-            foreach my $item ('linkprotuser','linkprotexit') {
-                if ($form->{$item} ne '') {
-                    $info{$item} = $form->{$item};
-                }
-            }
-            my $ltoken = &Apache::lonnet::tmpput(\%info,
-                                                 $r->dir_config('lonHostID'),'retry');
-            if ($ltoken) {
-                $retry .= (($retry =~ /\?/) ? '&' : '?').'ltoken='.$ltoken;
             }
         }
     } elsif ($querystr ne '') {
@@ -405,58 +333,6 @@ sub handler {
                     if ($firsturl ne '') {
                         $info{'firsturl'} = $firsturl;
                         $dest = $firsturl;
-                        my $relogin;
-                        if ($dest =~ m{^/tiny/$match_domain/\w+$}) {
-                            if ($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($dest,$cnum,$cdom);
-                                if ($symb) {
-                                    unless (&set_deeplink_login(%info) eq 'ok') {
-                                        $relogin = 1;
-                                    }
-                                }
-                            }
-                            if ($relogin) {
-                                $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);
-                            } else {
-                                if (($info{'linkprot'}) || ($info{'linkkey'} ne '')) {
-                                    if (($info{'linkprot'}) && ($info{'linkprotuser'} ne '')) {
-                                        unless ($info{'linkprotuser'} eq $env{'user.name'}.':'.$env{'user.domain'}) {
-                                            $r->print(
-                                                      $start_page
-                                                      .'<p class="LC_warning">'.&mt('You are already logged in, but as a different user from the one expected for the link you followed from another system').'</p>'
-                                                      .'<p>'.&mt('Please [_1]log out[_2] first, and then try following the link again from the other system',
-                                                                 '<a href="/adm/logout">','</a>')
-
-                                                      .'</p>'
-                                                      .$end_page);
-                                            return OK;
-                                        }
-                                    }
-                                    my $token = &Apache::lonnet::tmpput(\%info,$r->dir_config('lonHostID'),'link');
-                                    unless (($token eq 'con_lost') || ($token eq 'refused') ||
-                                            ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) {
-                                        $dest .= (($dest =~ /\?/) ? '&' : '?') . 'ttoken='.$token;
-                                    }
-                                }
-                                $r->print(
-                                      $start_page
-                                     .'<p class="LC_warning">'.&mt('You are already logged in!').'</p>'
-                                     .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4] first, and then try your access again',
-                                                '<a href="'.$dest.'">','</a>',
-                                                '<a href="/adm/logout">','</a>')
-                                     .'</p>'
-                                     .$end_page);
-                            }
-                            return OK;
-                        }
                     }
                 }
             }
@@ -524,9 +400,6 @@ sub handler {
         my ($key,$value) = split(/=/,$item);
         $form{$key} = &unescape($value);
     }
-    if ($firsturl =~ m{^/tiny/$match_domain/\w+$}) {
-        $form{'firsturl'} = $firsturl;
-    }
     my $upass = &Apache::loncommon::des_decrypt($des_key,$form{'upass0'});
 
 # ---------------------------------------------------------------- Authenticate
@@ -694,18 +567,6 @@ sub handler {
 	}
     }
 
-    if ($form{'firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
-        if (($form{'linkprot'}) && ($form{'linkprotuser'} ne '')) {
-            unless($form{'linkprotuser'} eq $form{'uname'}.':'.$form{'udom'}) {
-                delete($form{'udom'});
-                delete($form{'uname'});
-                &failed($r,'Username and/or domain are different to that expected for the link you followed from another system',
-                        \%form,$authhost);
-                return OK;
-            }
-        }
-    }
-
     my ($is_balancer,$otherserver);
 
     unless ($hosthere) {
@@ -747,19 +608,6 @@ sub handler {
             if ($form{'symb'}) {
                 $switchto .= '&symb='.$form{'symb'};
             }
-            if ($form{'linkprot'}) {
-                $env{'request.linkprot'} = $form{'linkprot'};
-                foreach my $item ('linkprotuser','linkprotexit') {
-                    if ($form{$item}) {
-                        $env{'request.'.$item} = $form{$item};
-                    }
-                }
-            } elsif ($form{'linkkey'} ne '') {
-                $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');
@@ -783,19 +631,6 @@ sub handler {
                 if ($form{'symb'}) {
                     $switchto .= '&symb='.$form{'symb'};
                 }
-                if ($form{'linkprot'}) {
-                    $env{'request.linkprot'} = $form{'linkprot'};
-                    foreach my $item ('linkprotuser','linkprotexit') {
-                        if ($form{$item}) {
-                            $env{'request.'.$item} = $form{$item};
-                        }
-                    }
-                } elsif ($form{'linkkey'} ne '') {
-                    $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');
@@ -827,14 +662,6 @@ sub handler {
             if ($unloaded) {
                 &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',
                          undef,\%form);
-                if ($form{'linkprot'}) {
-                    $env{'request.linkprot'} = $form{'linkprot'};
-                } elsif ($form{'linkkey'} ne '') {
-                    $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;
             }
@@ -855,43 +682,7 @@ sub handler {
                 }
             }
         }
-        if ($form{'linkprot'}) {
-            my ($linkprotector,$uri) = split(/:/,$form{'linkprot'},2);
-            if ($linkprotector) {
-                $extra_env = {'user.linkprotector' => $linkprotector,
-                              'user.linkproturi'   => $uri};
-            }
-        } elsif ($form{'linkkey'} ne '') {
-            $extra_env = {'user.deeplinkkey'  => $form{'linkkey'},
-                          'user.keyedlinkuri' => $form{'firsturl'}};
-        }
-        if ($form{'firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
-            &set_deeplink_login(%form);
-            if ($form{'linkprot'}) {
-                if (ref($extra_env) eq 'HASH') {
-                    %{$extra_env} = ( %{$extra_env}, 'request.linkprot' => $form{'linkprot'} );
-                } else {
-                    $extra_env = {'request.linkprot' => $form{'linkprot'}};
-                }
-                if ($form{'linkprotexit'}) {
-                    $extra_env->{'request.linkprotexit'} = $form{'linkprotexit'};
-                }
-            } elsif ($form{'linkkey'} ne '') {
-                if (ref($extra_env) eq 'HASH') {
-                    %{$extra_env} = ( %{$extra_env}, 'request.linkkey' => $form{'linkkey'} );
-                } else {
-                    $extra_env = {'request.linkkey' => $form{'linkkey'}};
-                }
-            }
-            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,
+        &success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,undef,
                  \%form);
         return OK;
     }
@@ -913,58 +704,11 @@ sub get_form_items {
     return %form;
 }
 
-sub set_deeplink_login {
-    my (%form) = @_;
-    my $disallow;
-    if ($form{'firsturl'} =~ m{^/tiny/($match_domain)/\w+$}) {
-        my $cdom = $1;
-        my ($cnum,$symb) = &Apache::loncommon::symb_from_tinyurl($form{'firsturl'},'',$cdom);
-        if ($symb) {
-            if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
-                my $deeplink;
-                if ($symb =~ /\.(page|sequence)$/) {
-                    my $mapname = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($symb))[2]);
-                    my $navmap = Apache::lonnavmaps::navmap->new();
-                    if (ref($navmap)) {
-                        $deeplink = $navmap->get_mapparam(undef,$mapname,'0.deeplink');
-                    }
-                } else {
-                    $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 =~ /lti(c|d)$/) {
-                            unless ($form{'linkprot'} eq $item.$1.':'.$env{'request.deeplink.login'}) {
-                                $disallow = 1;
-                            }
-                        } elsif ($acctype eq 'key') {
-                            unless ($form{'linkkey'} eq $item) {
-                                $disallow = 1;
-                            }
-                        }
-                    }
-                }
-                unless ($disallow) {
-                    $env{'request.deeplink.login'} = $form{'firsturl'};
-                }
-            } else {
-                $env{'request.deeplink.login'} = $form{'firsturl'};
-            }
-        }
-    }
-    if ($disallow) {
-        return;
-    }
-    return 'ok';
-}
-
 sub set_retry_token {
     my ($form,$lonhost,$querystr) = @_;
     if (ref($form) eq 'HASH') {
         my ($firsturl,$token,$extras,@names);
-        @names = ('role','symb','linkprotuser','linkprotexit','linkprot','linkkey','iptoken');
+        @names = ('role','symb','iptoken');
         foreach my $name (@names) {
             if ($form->{$name} ne '') {
                 $extras .= '&'.$name.'='.&escape($form->{$name});
@@ -1032,7 +776,6 @@ sub check_can_host {
                 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 />'.
@@ -1049,14 +792,6 @@ sub check_can_host {
         } else {
             &success($r,$form->{'uname'},$udom,$authhost,'noredirect',undef,
                      $form);
-            if ($form->{'firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
-                $env{'request.deeplink.login'} = $form->{'firsturl'};
-            }
-            if ($form->{'linkprot'}) {
-                $env{'request.linkprot'} = $form->{'linkprot'};
-            } elsif ($form->{'linkkey'} ne '') {
-                $env{'request.linkkey'} = $form->{'linkkey'};
-            }
             my ($otherserver) = &Apache::lonnet::choose_server($udom);
             $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver);
         }