--- loncom/lti/ltiauth.pm	2022/06/26 04:03:48	1.38
+++ loncom/lti/ltiauth.pm	2023/06/02 01:20:28	1.42
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Basic LTI Authentication Module
 #
-# $Id: ltiauth.pm,v 1.38 2022/06/26 04:03:48 raeburn Exp $
+# $Id: ltiauth.pm,v 1.42 2023/06/02 01:20:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -146,7 +146,7 @@ sub handler {
                         my ($itemid,$ltitype,%crslti,%lti_in_use,$ltiuser);
                         $itemid = &get_lti_itemid($requri,$hostname,$params,$cdom,$cnum,'linkprot');
                         if ($itemid) {
-                            %crslti = &Apache::lonnet::get_course_lti($cnum,$cdom);
+                            %crslti = &Apache::lonnet::get_course_lti($cnum,$cdom,'provider');
                         }
                         if (($itemid) && (ref($crslti{$itemid}) eq 'HASH')) {
                             $ltitype = 'c';
@@ -175,6 +175,21 @@ sub handler {
                                 }
                             }
                         }
+                        my $exiturl;
+                        if (($itemid) && ($lti_in_use{'returnurl'} ne '')) {
+                            if (exists($params->{$lti_in_use{'returnurl'}})) {
+                                $exiturl = $params->{$lti_in_use{'returnurl'}};
+                            } elsif (exists($params->{'custom_'.$lti_in_use{'returnurl'}})) {
+                                $exiturl = $params->{'custom_'.$lti_in_use{'returnurl'}};
+                            }
+                        }
+                        my ($pbid,$pburl);
+                        if ($params->{'lis_result_sourcedid'}) {
+                            $pbid = $params->{'lis_result_sourcedid'};
+                        }
+                        if ($params->{'lis_outcome_service_url'}) {
+                            $pburl = $params->{'lis_outcome_service_url'};
+                        }
                         if (($itemid) && ($lti_in_use{'requser'})) {
                             my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum);
                             my $ltiauth;
@@ -225,7 +240,8 @@ sub handler {
                                                 foreach my $key (%{$params}) {
                                                     delete($env{'form.'.$key});
                                                 }
-                                                &linkprot_session($r,$uname,$cnum,$cdom,$uhome,$itemid,$ltitype,$tail,$lonhost);
+                                                &linkprot_session($r,$uname,$cnum,$cdom,$uhome,$itemid,$ltitype,
+                                                                  $tail,$lonhost,$exiturl,$pbid,$pburl);
                                                 return OK;
                                             }
                                         }
@@ -248,6 +264,15 @@ sub handler {
                             if ($ltiuser ne '') {
                                 $info{'linkprotuser'} = $ltiuser;
                             }
+                            if ($exiturl ne '') {
+                                $info{'linkprotexit'} = $exiturl; 
+                            }
+                            if ($pbid ne '') {
+                                $info{'linkprotpbid'} = $pbid;
+                            }
+                            if ($pburl ne '') {
+                                $info{'linkprotpburl'} = $pburl;
+                            }
                             my $ltoken = &Apache::lonnet::tmpput(\%info,$lonhost,'link');
                             if (($ltoken eq 'con_lost') || ($ltoken eq 'refused') || ($ltoken =~ /^error:/) ||
                                 ($ltoken eq 'unknown_cmd') || ($ltoken eq 'no_such_host') ||
@@ -431,7 +456,7 @@ sub handler {
 #
 
     my %lti;
-    my $itemid = &get_lti_itemid($requri,$hostname,$params,$cdom);
+    my $itemid = &get_lti_itemid($requri,$hostname,$params,$cdom,'','provider');
     if ($itemid) {
         %lti = &Apache::lonnet::get_domain_lti($cdom,'provider');
     }
@@ -912,9 +937,8 @@ sub lti_session {
         # login but immediately go to switch server.
         &Apache::lonauth::success($r,$uname,$udom,$uhome,'noredirect');
         if (($ltihash->{'callback'}) && ($params->{$ltihash->{'callback'}})) {
-            &LONCAPA::ltiutils::setup_logout_callback($uname,$udom,$otherserver,
-                                                      $ltihash->{'key'},
-                                                      $ltihash->{'secret'},
+            &LONCAPA::ltiutils::setup_logout_callback($cdom,$cnum,'',$itemid,$ltihash->{'cipher'},
+                                                      $uname,$udom,$otherserver,
                                                       $params->{$ltihash->{'callback'}},
                                                       $r->dir_config('ltiIDsDir'),
                                                       $protocol,$r->hostname);
@@ -987,9 +1011,8 @@ sub lti_session {
             delete($env{'form.'.$key});
         }
         if (($ltihash->{'callback'}) && ($params->{$ltihash->{'callback'}})) {
-            &LONCAPA::ltiutils::setup_logout_callback($uname,$udom,$lonhost,
-                                                      $ltihash->{'key'},
-                                                      $ltihash->{'secret'},
+            &LONCAPA::ltiutils::setup_logout_callback($cdom,$cnum,'',$itemid,$ltihash->{'cipher'},
+                                                      $uname,$udom,$lonhost,
                                                       $params->{$ltihash->{'callback'}},
                                                       $r->dir_config('ltiIDsDir'),
                                                       $protocol,$r->hostname);
@@ -1061,7 +1084,7 @@ sub lti_session {
 }
 
 sub linkprot_session {
-    my ($r,$uname,$cnum,$cdom,$uhome,$itemid,$ltitype,$dest,$lonhost) = @_;
+    my ($r,$uname,$cnum,$cdom,$uhome,$itemid,$ltitype,$dest,$lonhost,$exiturl,$pbid,$pburl) = @_;
     $r->user($uname);
     if ($ltitype eq 'c') {
         &Apache::lonnet::logthis("Course Link Protector ($itemid) authorized student: $uname:$cdom, course: $cdom\_$cnum");
@@ -1076,6 +1099,15 @@ sub linkprot_session {
         $env{'request.linkprot'} = $itemid.$ltitype.':'.$dest;
         $env{'request.linkprotuser'} = $uname.':'.$cdom;
         $env{'request.deeplink.login'} = $dest;
+        if ($exiturl ne '') {
+            $env{'request.linkprotexit'} = $exiturl;
+        }
+        if ($pbid ne '') {
+            $env{'request.linkprotpbid'} = $pbid;
+        }
+        if ($pburl ne '') {
+            $env{'request.linkprotpburl'} = $pburl;
+        }
         my $redirecturl = '/adm/switchserver';
         if ($otherserver ne '') {
             $redirecturl .= '?otherserver='.$otherserver;
@@ -1095,6 +1127,15 @@ sub linkprot_session {
                   'origurl'        => $dest,
                   'deeplink.login' => $dest,
                  );
+        if ($pbid ne '') {
+            $info{'linkprotpbid'} = $pbid;
+        }
+        if ($pburl ne '') {
+            $info{'linkprotpburl'} = $pburl;
+        }
+        if ($exiturl ne '') {
+            $info{'linkprotexit'} = $exiturl; 
+        }
         my $token = &Apache::lonnet::tmpput(\%info,$lonhost);
         $env{'form.token'} = $token;
         $r->internal_redirect('/adm/migrateuser');
@@ -1109,6 +1150,11 @@ sub check_balancer {
     ($is_balancer,$otherserver) =
         &Apache::lonnet::check_loadbalancing($uname,$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$udom\E_\Q$uname\E_/)) {
+            $otherserver = $found_server;
+        }
         if ($otherserver eq '') {
             my $lowest_load;
             ($otherserver,undef,undef,undef,$lowest_load) = &Apache::lonnet::choose_server($udom);