--- loncom/lti/ltiauth.pm 2022/03/29 19:37:25 1.35
+++ loncom/lti/ltiauth.pm 2022/06/30 21:04:14 1.39
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Basic LTI Authentication Module
#
-# $Id: ltiauth.pm,v 1.35 2022/03/29 19:37:25 raeburn Exp $
+# $Id: ltiauth.pm,v 1.39 2022/06/30 21:04:14 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,7 +31,7 @@ package Apache::ltiauth;
use strict;
use LONCAPA qw(:DEFAULT :match);
use Encode;
-use Apache::Constants qw(:common :http);
+use Apache::Constants qw(:common :http :remotehost);
use Apache::lonlocal;
use Apache::lonnet;
use Apache::loncommon;
@@ -117,7 +117,7 @@ sub handler {
#
if ($requri =~ m{^/adm/launch(|/.*)$}) {
my $tail = $1;
- if ($tail =~ m{^/tiny/($match_domain)/(\w+)$}) {
+ if ($tail =~ m{^/tiny/$match_domain/\w+$}) {
my ($urlcdom,$urlcnum) = &course_from_tinyurl($tail);
if (($urlcdom ne '') && ($urlcnum ne '')) {
$cdom = $urlcdom;
@@ -143,7 +143,7 @@ sub handler {
# where url was /adm/launch/tiny/$cdom/$uniqueid
#
- my ($itemid,$ltitype,%crslti,%lti_in_use);
+ 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);
@@ -175,6 +175,14 @@ 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'}};
+ }
+ }
if (($itemid) && ($lti_in_use{'requser'})) {
my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum);
my $ltiauth;
@@ -225,14 +233,16 @@ 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);
return OK;
}
}
+ $ltiuser = $uname.':'.$cdom;
}
}
if ($lti_in_use{'notstudent'} eq 'reject') {
&invalid_request($r,'Information for valid user missing from launch request');
+ return OK;
}
}
}
@@ -240,13 +250,23 @@ sub handler {
foreach my $key (%{$params}) {
delete($env{'form.'.$key});
}
- my $ltoken = &Apache::lonnet::tmpput({'linkprot' => $itemid.$ltitype.':'.$tail},
- $lonhost,'link');
- if ($ltoken) {
+ my %info = (
+ 'linkprot' => $itemid.$ltitype.':'.$tail,
+ );
+ if ($ltiuser ne '') {
+ $info{'linkprotuser'} = $ltiuser;
+ }
+ if ($exiturl ne '') {
+ $info{'linkprotexit'} = $exiturl;
+ }
+ 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') ||
+ ($ltoken eq '')) {
+ &invalid_request($r,'Failed to store information from launch request');
+ } else {
$r->internal_redirect($tail.'?ltoken='.$ltoken);
$r->set_handlers('PerlHandler'=> undef);
- } else {
- &invalid_request($r,'Failed to store information from launch request');
}
} else {
&invalid_request($r,'Launch request could not be validated');
@@ -985,7 +1005,7 @@ sub lti_session {
$r->dir_config('ltiIDsDir'),
$protocol,$r->hostname);
}
- my $ip = $r->get_remote_host();
+ my $ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP);
my %info=('ip' => $ip,
'domain' => $udom,
'username' => $uname,
@@ -1052,7 +1072,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) = @_;
$r->user($uname);
if ($ltitype eq 'c') {
&Apache::lonnet::logthis("Course Link Protector ($itemid) authorized student: $uname:$cdom, course: $cdom\_$cnum");
@@ -1065,7 +1085,11 @@ sub linkprot_session {
&Apache::lonauth::success($r,$uname,$cdom,$uhome,'noredirect');
$env{'form.origurl'} = $dest;
$env{'request.linkprot'} = $itemid.$ltitype.':'.$dest;
+ $env{'request.linkprotuser'} = $uname.':'.$cdom;
$env{'request.deeplink.login'} = $dest;
+ if ($exiturl ne '') {
+ $env{'request.linkprotexit'} = $exiturl;
+ }
my $redirecturl = '/adm/switchserver';
if ($otherserver ne '') {
$redirecturl .= '?otherserver='.$otherserver;
@@ -1074,16 +1098,20 @@ sub linkprot_session {
$r->set_handlers('PerlHandler'=> undef);
} else {
# need to login them in, so generate the data migrate expects to do login
- my $ip = $r->get_remote_host();
+ my $ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP);
my %info=('ip' => $ip,
'domain' => $cdom,
'username' => $uname,
'server' => $lonhost,
'linkprot' => $itemid.$ltitype.':'.$dest,
+ 'linkprotuser' => $uname.':'.$cdom,
'home' => $uhome,
'origurl' => $dest,
'deeplink.login' => $dest,
);
+ if ($exiturl ne '') {
+ $info{'linkprotexit'} = $exiturl;
+ }
my $token = &Apache::lonnet::tmpput(\%info,$lonhost);
$env{'form.token'} = $token;
$r->internal_redirect('/adm/migrateuser');
@@ -1128,7 +1156,7 @@ sub invalid_request {
'<h3>'.&mt('Invalid LTI launch request').'</h3>'.
'<p class="LC_warning">'.
&mt('Launch of LON-CAPA is unavailable from the "external tool" link you had followed in another web application.').
- &mt('Launch failed for the following reason:').
+ ' '.&mt('Launch failed for the following reason:').
'</p>'.
'<p class="LC_error">'.$msg.'</p>'.
&Apache::loncommon::end_page());