--- loncom/auth/lonauth.pm	2022/02/27 01:43:13	1.172
+++ loncom/auth/lonauth.pm	2022/06/30 21:04:13	1.176
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.172 2022/02/27 01:43:13 raeburn Exp $
+# $Id: lonauth.pm,v 1.176 2022/06/30 21:04:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -179,11 +179,21 @@ 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'};
         }
@@ -200,9 +210,6 @@ sub success {
         $windowname .= 'lti';
     }
     my $windowinfo = Apache::lonhtmlcommon::scripttag('self.name="'.$windowname.'";');
-    my $brcrum = [{'href' => '',
-                   'text' => 'Successful Login'},];
-    my $args = {'bread_crumbs' => $brcrum,};
     unless ((defined($form->{role})) || (defined($form->{symb}))) {
         my $update=$env{'user.update.time'};
         if (!$update) {
@@ -248,6 +255,7 @@ sub success {
         if ($env{'request.lti.target'} eq '') {
             my $ltitarget = (($destination =~ /\?/) ? '&' : '?').
                             'ltitarget=iframe';
+            &js_escape(\$destination);
             $js = <<"ENDJS";
 
 <script type="text/javascript">
@@ -275,18 +283,19 @@ ENDJS
         $args->{'redirect'} = [0,$destination];
         $start_page=&Apache::loncommon::start_page('Successful Login',
                                                    $js,$args);
-
-        my %lt=&Apache::lonlocal::texthash(
-				           'wel' => 'Welcome',
-				           'pro' => 'Login problems?',
+        unless ($env{'request.linkprot'}) {
+            my %lt=&Apache::lonlocal::texthash(
+		    		               'wel' => 'Welcome',
+				               'pro' => 'Login problems?',
 				          );
-        $pagebody = "<h1>$lt{'wel'}</h1>\n".
-                    &mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','<i>','</i>');
-        my $loginhelp = &loginhelpdisplay($domain);
-        if ($loginhelp) {
-            $pagebody .= '<p><a href="'.$loginhelp.'">'.$lt{'pro'}.'</a></p>';
+            $pagebody = "<h1>$lt{'wel'}</h1>\n".
+                        &mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','<i>','</i>');
+            my $loginhelp = &loginhelpdisplay($domain);
+            if ($loginhelp) {
+                $pagebody .= '<p><a href="'.$loginhelp.'">'.$lt{'pro'}.'</a></p>';
+            }
         }
-    }
+    } 
     $end_page = &Apache::loncommon::end_page();
     $r->print(<<ENDSUCCESS);
 $start_page
@@ -307,6 +316,11 @@ 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 @actions;
     my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,$args);
@@ -356,7 +370,15 @@ sub failed {
             }
         }
         if (exists($form->{linkprot})) {
-            my $ltoken = &Apache::lonnet::tmpput({linkprot => $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;
@@ -474,6 +496,19 @@ sub handler {
                                      .$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')) {
@@ -729,6 +764,18 @@ 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) {
@@ -772,6 +819,11 @@ sub handler {
             }
             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'};
             }
@@ -803,6 +855,11 @@ sub handler {
                 }
                 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'};
                 }
@@ -886,6 +943,9 @@ sub handler {
                 } 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'} );
@@ -974,7 +1034,7 @@ sub set_retry_token {
     my ($form,$lonhost,$querystr) = @_;
     if (ref($form) eq 'HASH') {
         my ($firsturl,$token,$extras,@names);
-        @names = ('role','symb','linkprot','linkkey','iptoken');
+        @names = ('role','symb','linkprotuser','linkprotexit','linkprot','linkkey','iptoken');
         foreach my $name (@names) {
             if ($form->{$name} ne '') {
                 $extras .= '&'.$name.'='.&escape($form->{$name});